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

intel/eu/validate: Look up types on demand in execution_type()

Browse Source 
We are looking up the execution type prior to checking how many sources
we have.  This leads to looking for a type for src1 on MOV instructions
which is bogus.  On BDW+, the src1 register type overlaps with the
64-bit immediate and causes us problems.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
This commit is contained in:
Jason Ekstrand
2017-08-31 15:41:43 -07:00
parent 4ba20c9473
commit d496780fb2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,15 +300,13 @@ execution_type(const struct gen_device_info *devinfo, const brw_inst *inst)
{ {
unsigned num_sources = num_sources_from_inst(devinfo, inst); unsigned num_sources = num_sources_from_inst(devinfo, inst);
enum brw_reg_type src0_exec_type, src1_exec_type; enum brw_reg_type src0_exec_type, src1_exec_type;
enum brw_reg_type src0_type = brw_inst_src0_type(devinfo, inst);
enum brw_reg_type src1_type = brw_inst_src1_type(devinfo, inst);
/* Execution data type is independent of destination data type, except in /* Execution data type is independent of destination data type, except in
* mixed F/HF instructions on CHV and SKL+. * mixed F/HF instructions on CHV and SKL+.
*/ */
enum brw_reg_type dst_exec_type = brw_inst_dst_type(devinfo, inst); enum brw_reg_type dst_exec_type = brw_inst_dst_type(devinfo, inst);
src0_exec_type = execution_type_for_type(src0_type); src0_exec_type = execution_type_for_type(brw_inst_src0_type(devinfo, inst));
if (num_sources == 1) { if (num_sources == 1) {
if ((devinfo->gen >= 9 || devinfo->is_cherryview) && if ((devinfo->gen >= 9 || devinfo->is_cherryview) &&
src0_exec_type == BRW_REGISTER_TYPE_HF) { src0_exec_type == BRW_REGISTER_TYPE_HF) {
@@ -317,7 +315,7 @@ execution_type(const struct gen_device_info *devinfo, const brw_inst *inst)
return src0_exec_type; return src0_exec_type;
} }
src1_exec_type = execution_type_for_type(src1_type); src1_exec_type = execution_type_for_type(brw_inst_src1_type(devinfo, inst));
if (src0_exec_type == src1_exec_type) if (src0_exec_type == src1_exec_type)
return src0_exec_type; return src0_exec_type;