NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

intel/disasm: Remove duplicate variable reg_file

Browse source 
Fix defects reported by Coverity Scan.

Evaluation order violation (EVALUATION_ORDER)
write_write_typo: In reg_file = reg_file = brw_inst_dpas_3src_dst_reg_file(devinfo, inst),
reg_file is written twice with the same value.

Fixes: 1c92dad5cb ("intel/disasm: Disassembly support for DPAS")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27056>
(cherry picked from commit 73835874a82f741e10cbc8da9128a4f5cd46e347)
This commit is contained in:
Vinson Lee 2024-01-13 21:06:38 -08:00 • committed by Eric Engestrom
parent 5b8984f32f
commit b39ee4d766
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -34,7 +34,7 @@
"description": "intel/disasm: Remove duplicate variable reg_file",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "1c92dad5cb7f5d46dfaf56d2f9ce0203c2fbefbe",
"notes": null

12
src/intel/compiler/brw_disasm.c
View file

@ -1055,8 +1055,7 @@ static int
dest_dpas_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
uint32_t reg_file =
reg_file = brw_inst_dpas_3src_dst_reg_file(devinfo, inst);
uint32_t reg_file = brw_inst_dpas_3src_dst_reg_file(devinfo, inst);
if (reg(file, reg_file, brw_inst_dpas_3src_dst_reg_nr(devinfo, inst)) == -1)
return 0;
@ -1551,8 +1550,7 @@ static int
src0_dpas_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
uint32_t reg_file =
reg_file = brw_inst_dpas_3src_src0_reg_file(devinfo, inst);
uint32_t reg_file = brw_inst_dpas_3src_src0_reg_file(devinfo, inst);
if (reg(file, reg_file, brw_inst_dpas_3src_src0_reg_nr(devinfo, inst)) == -1)
return 0;
@ -1573,8 +1571,7 @@ static int
src1_dpas_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
uint32_t reg_file =
reg_file = brw_inst_dpas_3src_src1_reg_file(devinfo, inst);
uint32_t reg_file = brw_inst_dpas_3src_src1_reg_file(devinfo, inst);
if (reg(file, reg_file, brw_inst_dpas_3src_src1_reg_nr(devinfo, inst)) == -1)
return 0;
@ -1595,8 +1592,7 @@ static int
src2_dpas_3src(FILE *file, const struct intel_device_info *devinfo,
const brw_inst *inst)
{
uint32_t reg_file =
reg_file = brw_inst_dpas_3src_src2_reg_file(devinfo, inst);
uint32_t reg_file = brw_inst_dpas_3src_src2_reg_file(devinfo, inst);
if (reg(file, reg_file, brw_inst_dpas_3src_src2_reg_nr(devinfo, inst)) == -1)
return 0;