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

i965: Allow brw_eu_validate to handle compact instructions

Browse Source 
This will allow the validator to run on shader programs we find in the
GPU hang error state.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Matt Turner
2017-04-28 17:06:56 -07:00
parent a7217e909c
commit d98e82c772
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/intel/compiler/brw_eu_validate.c
View File

@@ -1036,10 +1036,17 @@ brw_validate_instructions(const struct gen_device_info *devinfo,
{ {
bool valid = true; bool valid = true;
for (int src_offset = start_offset; src_offset < end_offset; for (int src_offset = start_offset; src_offset < end_offset;) {
src_offset += sizeof(brw_inst)) {
struct string error_msg = { .str = NULL, .len = 0 }; struct string error_msg = { .str = NULL, .len = 0 };
const brw_inst *inst = assembly + src_offset; const brw_inst *inst = assembly + src_offset;
bool is_compact = brw_inst_cmpt_control(devinfo, inst);
brw_inst uncompacted;
if (is_compact) {
brw_compact_inst *compacted = (void *)inst;
brw_uncompact_instruction(devinfo, &uncompacted, compacted);
inst = &uncompacted;
}
if (is_unsupported_inst(devinfo, inst)) { if (is_unsupported_inst(devinfo, inst)) {
ERROR("Instruction not supported on this Gen"); ERROR("Instruction not supported on this Gen");
@@ -1056,6 +1063,12 @@ brw_validate_instructions(const struct gen_device_info *devinfo,
} }
valid = valid && error_msg.len == 0; valid = valid && error_msg.len == 0;
free(error_msg.str); free(error_msg.str);
if (is_compact) {
src_offset += sizeof(brw_compact_inst);
} else {
src_offset += sizeof(brw_inst);
}
} }
return valid; return valid;