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

intel/compiler: on MTL, DF instructions run in the math pipe

Browse Source 
Adjust the scoreboard code to take that into account.

Fixes at least:
  - dEQP-VK.glsl.builtin.precision_double.refract.compute.vec3
  - dEQP-VK.glsl.builtin.precision_double.matrixcompmult.compute.mat4

v2: use intel_device_info_is_mtl()  (Curro, Jordan)

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20072>
This commit is contained in:
Paulo Zanoni
2022-04-01 15:06:36 -07:00
committed by Marge Bot
parent 051887fbf3
commit 16b9f87104
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/intel/compiler/brw_fs_scoreboard.cpp
View File

@@ -1003,6 +1003,11 @@ namespace {
const ordered_address jp = p ? ordered_address(p, jps[ip].jp[IDX(p)]) : const ordered_address jp = p ? ordered_address(p, jps[ip].jp[IDX(p)]) :
ordered_address(); ordered_address();
const bool is_ordered = ordered_unit(devinfo, inst, IDX(TGL_PIPE_ALL)); const bool is_ordered = ordered_unit(devinfo, inst, IDX(TGL_PIPE_ALL));
const bool uses_math_pipe =
inst->is_math() ||
(intel_device_info_is_mtl(devinfo) &&
(get_exec_type(inst) == BRW_REGISTER_TYPE_DF ||
inst->dst.type == BRW_REGISTER_TYPE_DF));
/* Track any source registers that may be fetched asynchronously by this /* Track any source registers that may be fetched asynchronously by this
* instruction, otherwise clear the dependency in order to avoid * instruction, otherwise clear the dependency in order to avoid
@@ -1011,7 +1016,7 @@ namespace {
for (unsigned i = 0; i < inst->sources; i++) { for (unsigned i = 0; i < inst->sources; i++) {
const dependency rd_dep = const dependency rd_dep =
(inst->is_payload(i) || (inst->is_payload(i) ||
inst->is_math()) ? dependency(TGL_SBID_SRC, ip, exec_all) : uses_math_pipe) ? dependency(TGL_SBID_SRC, ip, exec_all) :
is_ordered ? dependency(TGL_REGDIST_SRC, jp, exec_all) : is_ordered ? dependency(TGL_REGDIST_SRC, jp, exec_all) :
dependency::done; dependency::done;

5
src/intel/compiler/brw_ir_fs.h
View File

@@ -548,7 +548,10 @@ is_send(const fs_inst *inst)
static inline bool static inline bool
is_unordered(const intel_device_info *devinfo, const fs_inst *inst) is_unordered(const intel_device_info *devinfo, const fs_inst *inst)
{ {
return is_send(inst) || inst->is_math(); return is_send(inst) || inst->is_math() ||
(intel_device_info_is_mtl(devinfo) &&
(get_exec_type(inst) == BRW_REGISTER_TYPE_DF ||
inst->dst.type == BRW_REGISTER_TYPE_DF));
} }
/** /**