Skip to content

Commit

Permalink
Add exception logic if logicalsize is 1 and byfx
Browse files Browse the repository at this point in the history 
Signed-off-by: Min, Byungil <[email protected]>
  • Loading branch information
@byungilm
byungilm committed Apr 14, 2021
1 parent baab8f7 commit 71b12bf
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 38 deletions.
65 changes: 34 additions & 31 deletions ...rdparty/clDNN/kernel_selector/core/actual_kernels/eltwise/eltwise_kernel_b_fs_yx_fsv4.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
#include <vector>

namespace kernel_selector {
static std::vector<size_t> GetLocalWorkGroupSizes(std::vector<size_t> gws, const EngineInfo& info);
static inline bool InputHasFeatureBroadcast(const eltwise_params& params, const size_t op_num, int input_idx);
static inline bool InputHasFeatureBroadcast(const eltwise_params& params, const size_t op_num, const size_t input_idx);

ParamsKey EltwiseKernel_b_fs_yx_fsv4::GetSupportedKey() const {
ParamsKey k;
Expand All @@ -24,6 +23,7 @@ ParamsKey EltwiseKernel_b_fs_yx_fsv4::GetSupportedKey() const {
k.EnableOutputDataType(Datatype::UINT8);
k.EnableInputLayout(DataLayout::b_fs_yx_fsv4);
k.EnableOutputLayout(DataLayout::b_fs_yx_fsv4);
k.EnableDifferentTypes();
k.EnableBatching();
k.EnableTensorPitches();
k.EnableTensorOffset();
Expand Down Expand Up @@ -78,7 +78,8 @@ bool EltwiseKernel_b_fs_yx_fsv4::Validate(const Params& params, const optional_p
return false;

for (size_t i = 0; i < ewParams.inputs.size(); i++) {
if (ewParams.inputs[i].GetLayout() != DataLayout::b_fs_yx_fsv4) {
if ((ewParams.inputs[i].GetLayout() != DataLayout::b_fs_yx_fsv4) &&
(ewParams.inputs[i].LogicalSize() != 1)) {
return false;
}
}
Expand Down Expand Up @@ -140,9 +141,12 @@ JitConstants EltwiseKernel_b_fs_yx_fsv4::MakeLoadJitConstants(const eltwise_para
jit.AddConstant(MakeJitConstant(idx_order, "b, f_block*4, y, x"));

if (params.inputs[input.index].LogicalSize() == 1) {
jit.AddConstant(MakeJitConstant(name,
"input" + std::to_string(input.index) +
"[0]"));
const std::string vload_name = "DO_VLOAD" + std::to_string(op_num) + "_" + std::to_string(input_idx);
const std::string vload_value = "\\\n\tMAKE_VECTOR_TYPE(ACCUMULATOR_TYPE, 4) tmp_a" + std::to_string(op_num) +
"_" + std::to_string(input_idx) + " = " "(MAKE_VECTOR_TYPE(ACCUMULATOR_TYPE, 4))" +
"(input" + std::to_string(input.index) + "[0])";
jit.AddConstant(MakeJitConstant(vload_name, vload_value));
jit.AddConstant(MakeJitConstant(name, "tmp_a" + std::to_string(op_num) + "_" + std::to_string(input_idx)));
} else {
bool feature_broadcasting = (params.inputs[input_idx].Feature().v == 1 && params.output.Feature().v != 1);

Expand All @@ -156,8 +160,9 @@ JitConstants EltwiseKernel_b_fs_yx_fsv4::MakeLoadJitConstants(const eltwise_para
jit.AddConstant(MakeJitConstant(name, "tmp_b" + std::to_string(op_num)));
} else {
const std::string vload_name = "DO_VLOAD" + std::to_string(op_num) + "_" + std::to_string(input_idx);
const std::string vload_value = "\\\n\tMAKE_VECTOR_TYPE(ACCUMULATOR_TYPE, 4) tmp_a" + std::to_string(op_num) + "_" + std::to_string(input_idx) +
" = TO_TYPE(MAKE_VECTOR_TYPE(ACCUMULATOR_TYPE, " + std::to_string(vec_size) + "), vload4(0, &input" + std::to_string(input.index) +
const std::string vload_value = "\\\n\tMAKE_VECTOR_TYPE(ACCUMULATOR_TYPE, 4) tmp_a" + std::to_string(op_num) +
"_" + std::to_string(input_idx) + " = TO_TYPE(MAKE_VECTOR_TYPE(ACCUMULATOR_TYPE, " +
std::to_string(vec_size) + "), vload4(0, &input" + std::to_string(input.index) +
"[GET_INDEX(INPUT," + std::to_string(input.index) + ", " + idx_order + ")]));";

jit.AddConstant(MakeJitConstant(vload_name, vload_value));
Expand Down Expand Up @@ -202,7 +207,12 @@ JitConstants EltwiseKernel_b_fs_yx_fsv4::GetJitConstants(const eltwise_params& p
std::string do_eltwise;
auto& operations = params.operations;
for (size_t op_num = 0; op_num < operations.size(); op_num++) {
for (size_t input_idx = 0; input_idx < params.inputs.size(); input_idx++) {
const auto &ew = operations[op_num];
for (size_t input_idx = 0; input_idx < ew.inputs.size(); input_idx++) {
const auto &input = ew.inputs[input_idx];
if (input.mode != EltwiseInputMode::INPUT_BUFFER && input.mode != EltwiseInputMode::SCALAR)
continue;

if (InputHasFeatureBroadcast(params, op_num, input_idx)) {
do_eltwise += "\\\n\tDO_FEATURE_BROADCAST" + std::to_string(op_num) + "_" + std::to_string(input_idx) + ";";
} else {
Expand Down Expand Up @@ -237,10 +247,22 @@ JitConstants EltwiseKernel_b_fs_yx_fsv4::GetJitConstants(const eltwise_params& p
jit.Merge(MakeFusedOpsJitConstants(params, {conf}));
}

jit.AddConstant(MakeJitConstant("ELTWISE_BROADCAST", params.broadcast));
jit.AddConstant(MakeJitConstant("QUANTIZATION_TERM", params.int8_quantization));
jit.AddConstant(MakeJitConstant("VEC_SIZE", vec_size));

if (params.broadcast) {
bool need_idx_safe = true;
for (size_t i = 0; i < params.inputs.size(); i++) {
if (params.inputs[i].LogicalSize() == 1) {
need_idx_safe = false;
break;
}
}

if (need_idx_safe)
jit.AddConstant(MakeJitConstant("ELTWISE_BROADCAST", params.broadcast));
}

return jit;
}

Expand All @@ -251,34 +273,15 @@ EltwiseKernelBase::DispatchData EltwiseKernel_b_fs_yx_fsv4::SetDefault(const elt
dispatchData.gws[1] = CeilDiv(params.output.Feature().v, 4);
dispatchData.gws[2] = params.output.Batch().v;

dispatchData.lws= GetLocalWorkGroupSizes(dispatchData.gws, params.engineInfo);
dispatchData.lws = GetOptimalLocalWorkGroupSizes(dispatchData.gws, params.engineInfo);
dispatchData.lws[1] = 1;
dispatchData.lws[2] = 1;

return dispatchData;
}

// Local
static std::vector<size_t> GetLocalWorkGroupSizes(std::vector<size_t> gws, const EngineInfo& info) {
const size_t lws_max = info.maxWorkGroupSize;
const size_t optimal_lws_values[] = {256, 227, 224, 192, 160, 128, 96, 64, 32, 16, 8, 7, 6, 5, 4, 2, 1};
size_t total_lws = 1;
std::vector<size_t> lws;
for (size_t i = 0; i < gws.size(); ++i) {
auto rest_lws = lws_max / total_lws;
size_t lws_idx = 0;
while (rest_lws < optimal_lws_values[lws_idx]) lws_idx++;

while (gws[i] % optimal_lws_values[lws_idx]) lws_idx++;

lws.push_back(optimal_lws_values[lws_idx]);
total_lws *= optimal_lws_values[lws_idx];
}

return lws;
}

static inline bool InputHasFeatureBroadcast(const eltwise_params& params, const size_t op_num, int input_idx) {
static inline bool InputHasFeatureBroadcast(const eltwise_params& params, const size_t op_num, const size_t input_idx) {
const auto &ew = params.operations[op_num];

const auto &input = ew.inputs[input_idx];
Expand Down
16 changes: 9 additions & 7 deletions inference-engine/thirdparty/clDNN/tests/test_cases/eltwise_gpu_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3682,6 +3682,7 @@ struct eltwise_random_test_params {
tensor second_input_size;

format::type in_format;
format::type in_format_second; // For testing 1x1x1x1 bfyx
format::type out_format;
eltwise_mode mode;
};
Expand Down Expand Up @@ -3767,7 +3768,7 @@ struct eltwise_random_test : testing::TestWithParam<eltwise_random_test_params>
auto eng = cldnn::engine();

auto in_layout1 = layout(params.input_type, params.in_format, params.first_input_size);
auto in_layout2 = layout(params.input_type, params.in_format, params.second_input_size);
auto in_layout2 = layout(params.input_type, params.in_format_second, params.second_input_size);
auto input1 = memory::allocate(eng, in_layout1);
auto input2 = memory::allocate(eng, in_layout2);
fill_random(input1);
Expand Down Expand Up @@ -3833,16 +3834,17 @@ struct eltwise_random_test_param_generator : std::vector<eltwise_random_test_par
}

eltwise_random_test_param_generator& broadcast_params(data_types type, format::type input_format, format::type output_format) {
push_back(eltwise_random_test_params{ type, {1, 1, 48, 64}, {1, 10, 48, 64}, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 16, 48, 64}, {1, 1, 48, 64}, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 5, 4, 4}, {1, 1, 4, 4}, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 1, 48, 64}, {1, 10, 48, 64}, input_format, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 16, 48, 64}, {1, 1, 48, 64}, input_format, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 5, 4, 4}, {1, 1, 4, 4}, input_format, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 8, 4, 4}, {1, 1, 1, 1}, input_format, format::bfyx, output_format, eltwise_mode::sum});
return *this;
}

eltwise_random_test_param_generator& simple_params(data_types type, format::type input_format, format::type output_format) {
push_back(eltwise_random_test_params{ type, {1, 10, 10, 10}, {1, 10, 10, 10}, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 5, 4, 4}, {1, 5, 4, 4}, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 20, 16, 16}, {1, 20, 16, 16}, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 10, 10, 10}, {1, 10, 10, 10}, input_format, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 5, 4, 4}, {1, 5, 4, 4}, input_format, input_format, output_format, eltwise_mode::sum});
push_back(eltwise_random_test_params{ type, {1, 20, 16, 16}, {1, 20, 16, 16}, input_format, input_format, output_format, eltwise_mode::sum});
return *this;
}
};
Expand Down

0 comments on commit 71b12bf

Please sign in to comment.