Skip to content

Commit bdeaf4e

Browse files
committed
[GPU] Unified FillCLKernelData's parameter that affects adding SHAPE_INFO to arguments during kernel generating
1 parent 2fe53b1 commit bdeaf4e

34 files changed

+133
-35
lines changed

src/plugins/intel_gpu/src/kernel_selector/kernels/activation/activation_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ KernelsData ActivationKernelBase::GetCommonKernelsData(const Params& params) con
109109
auto& kernel = kd.kernels[0];
110110
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
111111
EXE_MODE_DEFAULT, false, false, 1,
112-
GetFusedPrimitiveInputsCount(params), 1, newParams.outputs[0].is_dynamic());
112+
GetFusedPrimitiveInputsCount(params), 1, newParams.is_shape_agnostic);
113113

114114
if (!newParams.inputActivationParams.empty()) {
115115
kernel.params.arguments.push_back({ArgumentDescriptor::Types::SLOPE, 0});

src/plugins/intel_gpu/src/kernel_selector/kernels/arg_max_min/arg_max_min_kernel_axis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ KernelsData ArgMaxMinKernelAxis::GetKernelsData(const Params& params) const {
165165
1,
166166
GetFusedPrimitiveInputsCount(params),
167167
orgParams.use_multiple_outputs ? 2 : 1,
168-
is_dynamic);
168+
orgParams.is_shape_agnostic);
169169

170170
if (orgParams.has_second_output && !orgParams.use_multiple_outputs)
171171
kernel.params.arguments.push_back({ArgumentDescriptor::Types::INPUT, 1});

src/plugins/intel_gpu/src/kernel_selector/kernels/arg_max_min/arg_max_min_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ KernelsData ArgMaxMinKernelBase::GetCommonKernelsData(const Params& params) cons
7979
(uint32_t)orgParams.inputs.size(),
8080
GetFusedPrimitiveInputsCount(params),
8181
(uint32_t)orgParams.outputs.size(),
82-
orgParams.has_dynamic_tensors());
82+
orgParams.is_shape_agnostic);
8383

8484
return {kd};
8585
}

src/plugins/intel_gpu/src/kernel_selector/kernels/batch_to_space/batch_to_space_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ KernelsData BatchToSpaceKernelBase::GetCommonKernelsData(const Params& params) c
114114

115115
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
116116
"", false, false, static_cast<int>(newParams.inputs.size()),
117-
GetFusedPrimitiveInputsCount(params), 1, newParams.has_dynamic_tensors());
117+
GetFusedPrimitiveInputsCount(params), 1, newParams.is_shape_agnostic);
118118

119119
return { kd };
120120
}

src/plugins/intel_gpu/src/kernel_selector/kernels/beam_table_update/beam_table_update_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ KernelsData BeamTableUpdateKernelRef::GetKernelsData(const Params& params) const
5353
static_cast<int>(kernel_params.inputs.size()),
5454
GetFusedPrimitiveInputsCount(kernel_params),
5555
static_cast<int>(kernel_params.outputs.size()),
56-
kernel_params.outputs[0].is_dynamic());
56+
kernel_params.is_shape_agnostic);
5757

5858
ScalarDescriptor is_state_set;
5959
is_state_set.t = ScalarDescriptor::Types::UINT8;

src/plugins/intel_gpu/src/kernel_selector/kernels/border/border_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ KernelsData BorderKernelBase::GetCommonKernelsData(const Params& params) const {
104104
(uint32_t)prim_params.inputs.size(),
105105
GetFusedPrimitiveInputsCount(params),
106106
1,
107-
prim_params.outputs[0].is_dynamic());
107+
prim_params.is_shape_agnostic);
108108

109109
return {k_data};
110110
}

src/plugins/intel_gpu/src/kernel_selector/kernels/broadcast/broadcast_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ KernelsData BroadcastKernelBase::GetCommonKernelsData(const Params& params) cons
146146
1,
147147
0,
148148
1,
149-
prim_params.inputs[0].is_dynamic() || prim_params.outputs[0].is_dynamic());
149+
prim_params.is_shape_agnostic);
150150

151151
return {k_data};
152152
}

src/plugins/intel_gpu/src/kernel_selector/kernels/convolution/convolution_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ KernelsData ConvolutionKernelBase::GetCommonKernelsData(const Params& params,
232232
true,
233233
!newParams.bias.empty(),
234234
1, 0, 1,
235-
newParams.inputs[0].is_dynamic() || newParams.outputs[0].is_dynamic());
235+
newParams.is_shape_agnostic);
236236

237237
if (newParams.deformable_mode) {
238238
kernel.params.arguments.push_back({ArgumentDescriptor::Types::INPUT, 1});

src/plugins/intel_gpu/src/kernel_selector/kernels/convolution/convolution_kernel_bfyx_os_iyx_osv16.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ConvolutionKernel_bfyx_os_iyx_osv16 : public ConvolutionKernelBase {
3636
bool NeedPaddedInput() const override { return true; }
3737
DispatchData SetDefault(const convolution_params& arg, int autoTuneIndex = -1) const override;
3838
size_t GetSubGroupSize(const convolution_params& params) const {
39-
if (params.engineInfo.computeUnitsCount <= 24) {
39+
if (params.engineInfo.computeUnitsCount <= 24 && !params.is_shape_agnostic) {
4040
// Smaller # EU tends to be computation bounds.
4141
// In such case, using larger worksize will result in larger computational inefficiency
4242
// w.r.t the unalined output feature

src/plugins/intel_gpu/src/kernel_selector/kernels/cum_sum/cum_sum_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ KernelsData CumSumKernelBase::GetCommonKernelsData(const Params& params) const {
9898
"", false, false, 1,
9999
GetFusedPrimitiveInputsCount(params),
100100
1,
101-
newParams.outputs[0].is_dynamic());
101+
newParams.is_shape_agnostic);
102102

103103
return {kd};
104104
}

src/plugins/intel_gpu/src/kernel_selector/kernels/eltwise/eltwise_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ KernelsData EltwiseKernelBase::GetCommonKernelsData(const Params& params) const
757757

758758
kernel.params.workGroups.global = dispatchData.gws;
759759
kernel.params.workGroups.local = dispatchData.lws;
760-
bool is_dynamic = newParams.has_dynamic_tensors();
760+
bool is_dynamic = newParams.is_shape_agnostic;
761761
kernel.params.arguments = GetArgsDesc((uint32_t)newParams.inputs.size(),
762762
false,
763763
false,

src/plugins/intel_gpu/src/kernel_selector/kernels/fully_connected/fully_connected_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ KernelsData FullyConnectedKernelBase::GetCommonKernelsData(const Params &params,
146146
inputs_count,
147147
GetFusedPrimitiveInputsCount(params),
148148
1,
149-
orgParams.outputs[0].is_dynamic());
149+
orgParams.is_shape_agnostic);
150150

151151
// TODO Pass estimated time only through DispatchData
152152
kd.autoTuneIndex = autoTuneIndex;

src/plugins/intel_gpu/src/kernel_selector/kernels/gather/gather_elements_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ KernelsData GatherElementsKernelRef::GetKernelsData(const Params& params) const
178178

179179
auto& kernel = kd.kernels[0];
180180
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
181-
"", false, false, 2, GetFusedPrimitiveInputsCount(params), 1, newParams.has_dynamic_tensors());
181+
"", false, false, 2, GetFusedPrimitiveInputsCount(params), 1, newParams.is_shape_agnostic);
182182
return { kd };
183183
}
184184

src/plugins/intel_gpu/src/kernel_selector/kernels/gather/gather_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ KernelsData GatherKernelRef::GetKernelsData(const Params& params) const {
385385
inputs_count,
386386
GetFusedPrimitiveInputsCount(params),
387387
1,
388-
newParams.has_dynamic_tensors());
388+
newParams.is_shape_agnostic);
389389

390390
return {kd};
391391
}

src/plugins/intel_gpu/src/kernel_selector/kernels/gather/gather_nd_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ KernelsData GatherNDKernelRef::GetKernelsData(const Params& params) const {
212212
2,
213213
GetFusedPrimitiveInputsCount(params),
214214
1,
215-
newParams.has_dynamic_tensors());
215+
newParams.is_shape_agnostic);
216216

217217
return { kd };
218218
}

src/plugins/intel_gpu/src/kernel_selector/kernels/gemm/gemm_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ KernelsData GemmKernelBase::GetCommonKernelsData(const Params& params) const {
278278
(uint32_t)prim_params.inputs.size(),
279279
GetFusedPrimitiveInputsCount(params),
280280
1,
281-
prim_params.has_dynamic_tensors());
281+
prim_params.is_shape_agnostic);
282282

283283
return {k_data};
284284
}

src/plugins/intel_gpu/src/kernel_selector/kernels/mvn/mvn_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ KernelsData MVNKernelBase::GetCommonKernelsData(const Params& params) const {
9090
1,
9191
GetFusedPrimitiveInputsCount(params),
9292
1,
93-
orgParams.outputs[0].is_dynamic());
93+
orgParams.is_shape_agnostic);
9494

9595
return {kd};
9696
}

src/plugins/intel_gpu/src/kernel_selector/kernels/non_zero/count_nonzero_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ KernelsData CountNonzeroKernelRef::GetKernelsData(const Params& params) const {
102102
1,
103103
GetFusedPrimitiveInputsCount(params),
104104
1,
105-
newParams.inputs[0].is_dynamic());
105+
newParams.is_shape_agnostic);
106106

107107
return {kd};
108108
}

src/plugins/intel_gpu/src/kernel_selector/kernels/non_zero/gather_nonzero_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ KernelsData GatherNonzeroKernelRef::GetKernelsData(const Params& params) const {
105105
2,
106106
GetFusedPrimitiveInputsCount(params),
107107
1,
108-
newParams.outputs[0].is_dynamic());
108+
newParams.is_shape_agnostic);
109109

110110
return {kd};
111111
}

src/plugins/intel_gpu/src/kernel_selector/kernels/permute/permute_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ KernelsData PermuteKernelBase::GetKernelsData(const Params& params) const {
6969
1,
7070
GetFusedPrimitiveInputsCount(params),
7171
1,
72-
newParams.outputs[0].is_dynamic());
72+
newParams.is_shape_agnostic);
7373

7474
return {kd};
7575
}

src/plugins/intel_gpu/src/kernel_selector/kernels/reduce/reduce_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ KernelsData ReduceKernelBase::GetCommonKernelsData(const Params& p) const {
271271
1,
272272
GetFusedPrimitiveInputsCount(params),
273273
1,
274-
params.inputs[0].is_dynamic());
274+
params.is_shape_agnostic);
275275

276276
return {kd};
277277
}

src/plugins/intel_gpu/src/kernel_selector/kernels/reorder/reorder_kernel_base.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ KernelsData ReorderKernelBase::GetCommonKernelsData(const reorder_params& params
259259
1,
260260
GetFusedPrimitiveInputsCount(params),
261261
1,
262-
newParams.outputs[0].is_dynamic());
262+
newParams.is_shape_agnostic);
263263

264-
kernel.params.arguments = GetArgsDesc(1, false, false, GetFusedPrimitiveInputsCount(params), 1, newParams.outputs[0].is_dynamic());
264+
kernel.params.arguments = GetArgsDesc(1, false, false, GetFusedPrimitiveInputsCount(params), 1, newParams.is_shape_agnostic);
265265
if (newParams.mode == MeanSubtractMode::IN_BUFFER) {
266266
kernel.params.arguments.push_back({ArgumentDescriptor::Types::BIAS, 0});
267267
}

src/plugins/intel_gpu/src/kernel_selector/kernels/rms/rms_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ KernelsData RMSKernelBase::GetCommonKernelsData(const Params& params) const {
7878
2,
7979
GetFusedPrimitiveInputsCount(params),
8080
1,
81-
orgParams.outputs[0].is_dynamic());
81+
orgParams.is_shape_agnostic);
8282

8383
return {kd};
8484
}

src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_nd_update_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ KernelsData ScatterNDUpdateKernelRef::GetKernelsData(const Params& params) const
222222
clKernelData& kernel = kd.kernels[i];
223223

224224
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
225-
"", false, false, inputs_number, GetFusedPrimitiveInputsCount(params), 1, newParams.has_dynamic_tensors());
225+
"", false, false, inputs_number, GetFusedPrimitiveInputsCount(params), 1, newParams.is_shape_agnostic);
226226
}
227227

228228
return {kd};

src/plugins/intel_gpu/src/kernel_selector/kernels/scatter_update/scatter_update_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ KernelsData ScatterUpdateKernelRef::GetKernelsData(const Params& params) const {
351351
clKernelData& kernel = kd.kernels[i - start_with_iteration];
352352

353353
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
354-
"", false, false, 3, GetFusedPrimitiveInputsCount(params), 1, newParams.has_dynamic_tensors());
354+
"", false, false, 3, GetFusedPrimitiveInputsCount(params), 1, newParams.is_shape_agnostic);
355355
}
356356

357357
return {kd};

src/plugins/intel_gpu/src/kernel_selector/kernels/select/select_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ KernelsData SelectKernelBase::GetCommonKernelsData(const Params& params) const {
142142
(uint32_t)newParams.inputs.size(),
143143
0,
144144
1,
145-
newParams.outputs[0].is_dynamic());
145+
newParams.is_shape_agnostic);
146146

147147
return {kd};
148148
}

src/plugins/intel_gpu/src/kernel_selector/kernels/shape_of/shape_of_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ KernelsData ShapeOfKernelRef::GetKernelsData(const Params &params) const {
6060
GetUpdateDispatchDataFunc(kernel_data);
6161

6262
FillCLKernelData(clKernelData, dispatch_data, params.engineInfo, kernelName, jit, entry_point, EXE_MODE_DEFAULT,
63-
false, false, 0, 0, 1, derived_params.inputs[0].is_dynamic());
63+
false, false, 0, 0, 1, derived_params.is_shape_agnostic);
6464
return kernels_data;
6565
}
6666

src/plugins/intel_gpu/src/kernel_selector/kernels/softmax/softmax_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ KernelsData SoftmaxKernelBase::GetCommonKernelsData(const Params& params) const
6969
1,
7070
GetFusedPrimitiveInputsCount(params),
7171
1,
72-
orgParams.outputs[0].is_dynamic());
72+
orgParams.is_shape_agnostic);
7373

7474
return {kd};
7575
}

src/plugins/intel_gpu/src/kernel_selector/kernels/space_to_batch/space_to_batch_kernel_base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ KernelsData SpaceToBatchKernelBase::GetCommonKernelsData(const Params& params) c
114114

115115
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
116116
"", false, false, static_cast<int>(newParams.inputs.size()),
117-
GetFusedPrimitiveInputsCount(params), 1, newParams.has_dynamic_tensors());
117+
GetFusedPrimitiveInputsCount(params), 1, newParams.is_shape_agnostic);
118118

119119
return { kd };
120120
}

src/plugins/intel_gpu/src/kernel_selector/kernels/strided_slice/strided_slice_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ KernelsData StridedSliceKernelRef::GetKernelsData(const Params& params) const {
252252

253253
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
254254
"", false, false, static_cast<int>(newParams.inputs.size()),
255-
0, 1, newParams.has_dynamic_tensors());
255+
0, 1, newParams.is_shape_agnostic);
256256

257257
return {kd};
258258
}

src/plugins/intel_gpu/src/kernel_selector/kernels/swiglu/swiglu_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ KernelsData SwiGLUKernelRef::GetKernelsData(const Params& params) const {
8686
1,
8787
GetFusedPrimitiveInputsCount(params),
8888
1,
89-
orgParams.has_dynamic_tensors());
89+
orgParams.is_shape_agnostic);
9090

9191
return {kd};
9292
}

src/plugins/intel_gpu/src/kernel_selector/kernels/tile/tile_kernel_ref.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ KernelsData TileKernelRef::GetKernelsData(const Params& params) const {
7777
auto& kernel = kd.kernels[0];
7878

7979
FillCLKernelData(kernel, dispatchData, params.engineInfo, kernelName, jit, entry_point,
80-
EXE_MODE_DEFAULT, false, false, 1, 0, 1, newParams.has_dynamic_tensors());
80+
EXE_MODE_DEFAULT, false, false, 1, 0, 1, newParams.is_shape_agnostic);
8181

8282
return {kd};
8383
}

src/plugins/intel_gpu/src/kernel_selector/kernels/unique/unique_kernel_ref.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ KernelsData UniqueCountKernelRef::GetKernelsData(const Params& params) const {
165165
static_cast<int>(kernel_params.inputs.size()),
166166
GetFusedPrimitiveInputsCount(kernel_params),
167167
static_cast<int>(kernel_params.outputs.size()),
168-
kernel_params.inputs.front().is_dynamic());
168+
kernel_params.is_shape_agnostic);
169169

170170
// Additional buffer to save intermediate algorithm results
171171
kernel.params.arguments.push_back({ArgumentDescriptor::Types::INTERNAL_BUFFER, 0});
@@ -276,7 +276,7 @@ KernelsData UniqueGatherKernelRef::GetKernelsData(const Params& params) const {
276276
static_cast<int>(kernel_params.inputs.size()),
277277
GetFusedPrimitiveInputsCount(kernel_params),
278278
static_cast<int>(kernel_params.outputs.size()),
279-
kernel_params.outputs.front().is_dynamic());
279+
kernel_params.is_shape_agnostic);
280280

281281
return {kernel_data};
282282
}

0 commit comments

Comments
 (0)