Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GPU] Skip fc fake alignment when fused desc has full tensor input #25249

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/plugins/intel_gpu/src/graph/fully_connected.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,22 @@ kernel_impl_params fully_connected_inst::get_fake_aligned_params(kernel_impl_par
can_apply_fake_alignment &= orig_output_layout.data_padding.lower_size().sizes()[1] == 0 &&
orig_output_layout.data_padding.upper_size().sizes()[1] == 0;

for (auto& fused_desc : orig_impl_param.fused_desc) {
if (fused_desc.has_outer_dep()) {
auto fused_op_input_layout = orig_impl_param.input_layouts[fused_desc.outer_dep_start_idx];
// Check fused desc's input is still dynamic, then do not fake alignment
if (fused_op_input_layout.is_dynamic()) {
can_apply_fake_alignment = false;
break;
}
// Check fused desc's input has full tensor, then do not fake alignment
if (orig_output_layout.get_shape() == fused_op_input_layout.get_shape()) {
can_apply_fake_alignment = false;
break;
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not every of the fused node has outer dep.
So I'd like to suggest

  1. iterate fused_desc
  2. if fused_desc->has_outer_dep() get outer_dep_start_idx, and check input_layouts[outer_dep_start_idx]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated! Thanks!


GPU_DEBUG_GET_INSTANCE(debug_config);
GPU_DEBUG_IF(debug_config->disable_fake_alignment) {
can_apply_fake_alignment = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
#include <intel_gpu/primitives/input_layout.hpp>
#include <intel_gpu/primitives/fully_connected.hpp>
#include <intel_gpu/primitives/data.hpp>
#include <intel_gpu/primitives/eltwise.hpp>
#include <intel_gpu/primitives/permute.hpp>

#include "fully_connected_inst.h"
#include "eltwise_inst.h"

#include "program_wrapper.h"

Expand Down Expand Up @@ -210,4 +213,67 @@ INSTANTIATE_TEST_SUITE_P(smoke, fully_connected_fake_align_test,
},
}));

class fully_connected_skip_fake_align_test : public testing::TestWithParam<fc_fake_align_params> {};

// Skip fake alignment when fused desc has full tensor dependency
TEST_P(fully_connected_skip_fake_align_test, skip_fake_alignment_case) {
auto p = GetParam();

auto& engine = get_test_engine();
topology topology;
cldnn::program prog(engine);

topology.add(input_layout("input", p.input_layout));
topology.add(input_layout("eltwise_data1",p.input_layout));
topology.add(eltwise("eltwise_add1", { input_info("input"), input_info("eltwise_data1") }, eltwise_mode::sum));

topology.add(input_layout("weights", p.weight_layout));
topology.add(fully_connected("fc_prim1", input_info("eltwise_add1"), "weights", "",
cldnn::data_types::f32, padding(), p.input_layout.get_rank(), p.weight_layout.get_rank()));

topology.add(input_layout("bias",
layout{ov::PartialShape{1, 1, p.expected_output_layout_igpu.get_dims()[2]}, cldnn::data_types::f32, cldnn::format::bfyx}));
topology.add(eltwise("bias_add", { input_info("fc_prim1"), input_info("bias") }, eltwise_mode::sum));

topology.add(input_layout("dequantize_scale",
layout{ov::PartialShape{1, 1, p.expected_output_layout_igpu.get_dims()[2]}, cldnn::data_types::f32, cldnn::format::bfyx}));
topology.add(eltwise("eltwise_multiply", { input_info("bias_add"), input_info("dequantize_scale") }, eltwise_mode::prod));

topology.add(input_layout("eltwise_data2", p.expected_output_layout_igpu));
topology.add(eltwise("eltwise_add2", { input_info("eltwise_multiply"), input_info("eltwise_data2") }, eltwise_mode::sum));
topology.add(permute("permute", input_info("eltwise_add2"), {2, 1, 0}));

ExecutionConfig config = get_test_default_config(engine);
config.set_property(ov::intel_gpu::optimize_data(true));
config.set_property(ov::intel_gpu::allow_new_shape_infer(true));
network network(engine, topology, config);

auto impl_param = network.get_primitive("fc_prim1")->get_impl_params();

if (impl_param->get_input_layout().is_dynamic() || impl_param->get_output_layout().is_dynamic()) {
EXPECT_THROW(fully_connected_inst::get_fake_aligned_params(*impl_param), std::exception);
} else {
auto updated_param = fully_connected_inst::get_fake_aligned_params(*impl_param);
if (!engine.get_device_info().supports_immad) {
ASSERT_EQ(updated_param.get_input_layout(), p.expected_input_layout_igpu);
ASSERT_EQ(updated_param.get_output_layout(), p.expected_output_layout_igpu);
} else {
ASSERT_EQ(updated_param.get_input_layout(), p.expected_input_layout_dgpu);
ASSERT_EQ(updated_param.get_output_layout(), p.expected_output_layout_dgpu);
}
}
}

INSTANTIATE_TEST_SUITE_P(smoke, fully_connected_skip_fake_align_test,
testing::ValuesIn(std::vector<fc_fake_align_params>{
{
layout{ov::PartialShape{1, 1000, 2048}, data_types::u8, format::bfyx}, // input_layout
layout{ov::PartialShape{512, 2048}, data_types::i8, format::bfyx}, // weight layout
data_types::f32,
layout{ov::PartialShape{1, 1000, 2048}, data_types::u8, format::bfyx}, // skiped fake_aligned input layout_igpu
layout{ov::PartialShape{1, 1000, 512}, data_types::f32, format::bfyx}, // skipped fake_aligned output layout_igpu
layout{ov::PartialShape{1, 1000, 2048}, data_types::u8, format::bfyx}, // skipped fake_aligned input layout_dgpu
layout{ov::PartialShape{1, 1000, 512}, data_types::f32, format::bfyx} // skipped fake_aligned output layout_dgpu
},
}));
} // fake_alignment_tests
Loading