summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2020-09-04 03:02:50 -0700
committerDylan Baker <dylan.c.baker@intel.com>2020-09-11 10:32:42 -0700
commitee1d4d5ee3e387adde9a72e5e958d14b5a7e5ab9 (patch)
tree2a8eb160fc904bc7976ae538076510ea1ab37f84
parente98a278dcdbd3f1d18626ece7faeb6488a6a9f4c (diff)
aco: handle unaligned loads on GFX10.3
Same as GFX10. Cc: 20.2 mesa-stable Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Rhys Perry <pendingchaos02@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6594> (cherry picked from commit 73eb24ab31a4d6e167ae8e8394f9f26f7c7d5c59)
-rw-r--r--.pick_status.json2
-rw-r--r--src/amd/compiler/aco_instruction_selection.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index fda8906a558..8eb653ec59d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2029,7 +2029,7 @@
"description": "aco: handle unaligned loads on GFX10.3",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index c20911ab73a..88522b46711 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -4665,7 +4665,7 @@ bool check_vertex_fetch_size(isel_context *ctx, const ac_data_format_info *vtx_i
unsigned vertex_byte_size = vtx_info->chan_byte_size * channels;
if (vtx_info->chan_byte_size != 4 && channels == 3)
return false;
- return (ctx->options->chip_class != GFX6 && ctx->options->chip_class != GFX10) ||
+ return (ctx->options->chip_class >= GFX7 && ctx->options->chip_class <= GFX9) ||
(offset % vertex_byte_size == 0 && stride % vertex_byte_size == 0);
}