OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clc: parse localSize and localSizeHint

Browse Source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16479>
This commit is contained in:
Karol Herbst
2022-04-24 13:21:13 +02:00
committed by Marge Bot
parent e8eb6d13a5
commit c0cf7f578a
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/clc/clc.h
View File

@@ -128,6 +128,9 @@ struct clc_kernel_info {
unsigned vec_hint_size;
enum clc_vec_hint_type vec_hint_type;
unsigned local_size[3];
unsigned local_size_hint[3];
};
enum clc_spec_constant_type {

31
src/compiler/clc/clc_helpers.cpp
View File

@@ -102,13 +102,16 @@ public:
class SPIRVKernelInfo {
public:
SPIRVKernelInfo(uint32_t fid, const char *nm) : funcId(fid), name(nm), vecHint(0) { }
SPIRVKernelInfo(uint32_t fid, const char *nm)
: funcId(fid), name(nm), vecHint(0), localSize(), localSizeHint() { }
~SPIRVKernelInfo() { }
uint32_t funcId;
std::string name;
std::vector<SPIRVKernelArg> args;
unsigned vecHint;
unsigned localSize[3];
unsigned localSizeHint[3];
};
class SPIRVKernelParser {
@@ -447,14 +450,26 @@ public:
void parseExecutionMode(const spv_parsed_instruction_t *ins)
{
uint32_t executionMode = ins->words[ins->operands[1].offset];
if (executionMode != SpvExecutionModeVecTypeHint)
return;
uint32_t funcId = ins->words[ins->operands[0].offset];
uint32_t vecHint = ins->words[ins->operands[2].offset];
for (auto& kernel : kernels) {
if (kernel.funcId == funcId)
kernel.vecHint = vecHint;
if (kernel.funcId == funcId) {
switch (executionMode) {
case SpvExecutionModeVecTypeHint:
kernel.vecHint = ins->words[ins->operands[2].offset];
break;
case SpvExecutionModeLocalSize:
kernel.localSize[0] = ins->words[ins->operands[2].offset];
kernel.localSize[1] = ins->words[ins->operands[3].offset];
kernel.localSize[2] = ins->words[ins->operands[4].offset];
case SpvExecutionModeLocalSizeHint:
kernel.localSizeHint[0] = ins->words[ins->operands[2].offset];
kernel.localSizeHint[1] = ins->words[ins->operands[3].offset];
kernel.localSizeHint[2] = ins->words[ins->operands[4].offset];
default:
return;
}
}
}
}
@@ -692,6 +707,8 @@ clc_spirv_get_kernels_info(const struct clc_binary *spvbin,
kernels[i].num_args = parser.kernels[i].args.size();
kernels[i].vec_hint_size = parser.kernels[i].vecHint >> 16;
kernels[i].vec_hint_type = (enum clc_vec_hint_type)(parser.kernels[i].vecHint & 0xFFFF);
memcpy(kernels[i].local_size, parser.kernels[i].localSize, sizeof(kernels[i].local_size));
memcpy(kernels[i].local_size_hint, parser.kernels[i].localSizeHint, sizeof(kernels[i].local_size_hint));
if (!kernels[i].num_args)
continue;