aco/gfx11: update s_code_end padding

Match ac_rtld_open().

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Cc: 22.3 <mesa-stable>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20536>
(cherry picked from commit 9e55b3b790997573d7e4110332024d1052d0ccc3)

diff --git a/.pick_status.json b/.pick_status.json
index b08e0d2..49487ab 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1840,7 +1840,7 @@
         "description": "aco/gfx11: update s_code_end padding",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 9da9dd3..0816370 100644 (file)
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -1141,7 +1141,7 @@ emit_program(Program* program, std::vector<uint32_t>& code)
    if (program->gfx_level >= GFX10) {
       /* Pad output with s_code_end so instruction prefetching doesn't cause
        * page faults */
-      unsigned final_size = align(code.size() + 3 * 16, 16);
+      unsigned final_size = align(code.size() + 3 * 16, program->gfx_level >= GFX11 ? 32 : 16);
       while (code.size() < final_size)
          code.push_back(0xbf9f0000u);
    }