diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2020-09-18 18:11:10 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-09-24 09:32:14 -0700 |
| commit | 5fbb4771a70bfdf38c6a2ebf1b19d317a55672e6 (patch) | |
| tree | 3b54b87946ea0eefc7d37269c2389d0145ac5894 | |
| parent | 424203520fefd21fb85c614d78abcb19072b9cff (diff) | |
intel/fs/swsb: SCHEDULING_FENCE only emits SYNC_NOP
It's not really unordered in the sense that it can still stall on
ordered things and we don't need a SYNC_NOP for that because it is a
SYNC_NOP. However, it also doesn't count when computing instruction
distances.
Fixes: 18e72ee2108 "intel/fs: Add FS_OPCODE_SCHEDULING_FENCE"
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6781>
(cherry picked from commit f63ffc18e79a94ff7a4c418341e644cc3894a03a)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_scoreboard.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 519bb46f0d6..1514c5ea1d1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -976,7 +976,7 @@ "description": "intel/fs/swsb: SCHEDULING_FENCE only emits SYNC_NOP", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "18e72ee2108a9388b8d1890311dd22f69886438a" }, diff --git a/src/intel/compiler/brw_fs_scoreboard.cpp b/src/intel/compiler/brw_fs_scoreboard.cpp index 0e810218db6..899b47542ba 100644 --- a/src/intel/compiler/brw_fs_scoreboard.cpp +++ b/src/intel/compiler/brw_fs_scoreboard.cpp @@ -77,6 +77,7 @@ namespace { case BRW_OPCODE_DO: case SHADER_OPCODE_UNDEF: case FS_OPCODE_PLACEHOLDER_HALT: + case FS_OPCODE_SCHEDULING_FENCE: return 0; default: /* Note that the following is inaccurate for virtual instructions |