From: Rhys Perry <pendingchaos02@gmail.com>
Date: Tue, 8 Oct 2019 12:47:00 +0000 (+0200)
Subject: aco: pad code with s_code_end on GFX10
X-Git-Tag: upstream/19.3.0~1246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d63c175897e31e2a78eb346362a7c90a2fec5f13;p=platform%2Fupstream%2Fmesa.git

aco: pad code with s_code_end on GFX10

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-By: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
---

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 5a82d44..7636124 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -4,6 +4,7 @@
 #include "aco_ir.h"
 #include "common/sid.h"
 #include "ac_shader_util.h"
+#include "util/u_math.h"
 
 namespace aco {
 
@@ -668,16 +669,26 @@ unsigned emit_program(Program* program,
    }
 
    fix_branches(ctx, code);
+
+   unsigned exec_size = code.size() * sizeof(uint32_t);
+
+   if (program->chip_class >= GFX10) {
+      /* Pad output with s_code_end so instruction prefetching doesn't cause
+       * page faults */
+      unsigned final_size = align(code.size() + 3 * 16, 16);
+      while (code.size() < final_size)
+         code.push_back(0xbf9f0000u);
+   }
+
    fix_constaddrs(ctx, code);
 
-   unsigned constant_data_offset = code.size() * sizeof(uint32_t);
    while (program->constant_data.size() % 4u)
       program->constant_data.push_back(0);
    /* Copy constant data */
    code.insert(code.end(), (uint32_t*)program->constant_data.data(),
                (uint32_t*)(program->constant_data.data() + program->constant_data.size()));
 
-   return constant_data_offset;
+   return exec_size;
 }
 
 }