projects / llvm / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 185d55e)
AMDGPU/GFX10: Don't generate s_code_end padding in the asm-printer
authorNicolai Haehnle <nhaehnle@gmail.com>
Mon, 17 Jun 2019 19:28:43 +0000 (19:28 +0000)
committerNicolai Haehnle <nhaehnle@gmail.com>
Mon, 17 Jun 2019 19:28:43 +0000 (19:28 +0000)
Summary:
The purpose of the padding is to guard against stale code being
fetched into the instruction cache by the lowest level prefetching.
We're generating relocatable ELF here, and so the padding should
arguably be added by the linker. This is in fact what Mesa does.

This also fixes multi-part shaders for Mesa.

Change-Id: I6bfede58f20e9f337762ccf39ef9e0e263e69e82

Reviewers: arsenm, rampitec, t-tye

Subscribers: kzhuravl, jvesely, wdng, yaxunl, dstuttard, tpr, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D63427

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@363602 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp patch | blob | history
test/CodeGen/AMDGPU/s_code_end.ll patch | blob | history

diff --git a/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp b/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
index 03c6a671338666bac6315c65449aed70f0d89fa2..5578251bcfc41d0b6d954ec97a3a7f39f48f6392 100644 (file)
--- a/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
+++ b/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
@@ -309,7 +309,13 @@ void AMDGPUAsmPrinter::EmitGlobalVariable(const GlobalVariable *GV) {
 bool AMDGPUAsmPrinter::doFinalization(Module &M) {
   CallGraphResourceInfo.clear();
 
-  if (AMDGPU::isGFX10(*getGlobalSTI())) {
+  // Pad with s_code_end to help tools and guard against instruction prefetch
+  // causing stale data in caches. Arguably this should be done by the linker,
+  // which is why this isn't done for Mesa.
+  const MCSubtargetInfo &STI = *getGlobalSTI();
+  if (AMDGPU::isGFX10(STI) &&
+      (STI.getTargetTriple().getOS() == Triple::AMDHSA ||
+       STI.getTargetTriple().getOS() == Triple::AMDPAL)) {
     OutStreamer->SwitchSection(getObjFileLowering().getTextSection());
     getTargetStreamer()->EmitCodeEnd();
   }
diff --git a/test/CodeGen/AMDGPU/s_code_end.ll b/test/CodeGen/AMDGPU/s_code_end.ll
index 80f566ba926c3277cd65b381519eb62f8b563667..2e87098a42f1f58c954f4b6a4910f70bb96de6b4 100644 (file)
--- a/test/CodeGen/AMDGPU/s_code_end.ll
+++ b/test/CodeGen/AMDGPU/s_code_end.ll
@@ -1,11 +1,13 @@
-; RUN: llc -march=amdgcn -mcpu=gfx1010 -asm-verbose=0 < %s | FileCheck -check-prefixes=GCN,GCN-ASM,GFX10,GFX10-ASM %s
-; RUN: llc -march=amdgcn -mcpu=gfx1010 -filetype=obj < %s | llvm-objdump -arch=amdgcn -mcpu=gfx1010 -disassemble - | FileCheck -check-prefixes=GCN,GCN-OBJ,GFX10,GFX10-OBJ %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 -asm-verbose=0 < %s | FileCheck -check-prefixes=GCN,GCN-ASM,GFX10END,GFX10END-ASM %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1010 -filetype=obj < %s | llvm-objdump -arch=amdgcn -mcpu=gfx1010 -disassemble - | FileCheck -check-prefixes=GCN,GCN-OBJ,GFX10END,GFX10END-OBJ %s
+; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx1010 -asm-verbose=0 < %s | FileCheck -check-prefixes=GCN,GCN-ASM,GFX10END,GFX10END-ASM %s
+; RUN: llc -mtriple=amdgcn-mesa-mesa3d -mcpu=gfx1010 -asm-verbose=0 < %s | FileCheck -check-prefixes=GCN,GCN-ASM,GFX10NOEND,GFX10NOEND-ASM %s
+; RUN: llc -mtriple=amdgcn-- -mcpu=gfx1010 -filetype=obj < %s | llvm-objdump -arch=amdgcn -mcpu=gfx1010 -disassemble - | FileCheck -check-prefixes=GCN,GCN-OBJ,GFX10NOEND,GFX10NOEND-OBJ %s
 
 ; GCN:            a_kernel1:
-; GCN-NEXT:               s_endpgm
-; GCN-ASM-NEXT:   [[END_LABEL1:\.Lfunc_end.*]]:
+; GCN:                    s_endpgm
+; GCN-ASM:        [[END_LABEL1:\.Lfunc_end.*]]:
 ; GCN-ASM-NEXT:           .size   a_kernel1, [[END_LABEL1]]-a_kernel1
-; GCN-ASM:                .section        .AMDGPU.config
 
 ; GCN-OBJ-NEXT:           s_nop 0
 
@@ -14,19 +16,17 @@ define amdgpu_kernel void @a_kernel1() {
 }
 
 ; GCN:            a_kernel2:
-; GCN-NEXT:               s_endpgm
-; GCN-ASM-NEXT:   [[END_LABEL2:\.Lfunc_end.*]]:
+; GCN:                    s_endpgm
+; GCN-ASM:        [[END_LABEL2:\.Lfunc_end.*]]:
 ; GCN-ASM-NEXT:           .size   a_kernel2, [[END_LABEL2]]-a_kernel2
-; GCN-ASM:                .section        .AMDGPU.config
 
-; GCN-OBJ-NEXT:   {{^$}}
+; GCN-OBJ:   {{^$}}
 
 define amdgpu_kernel void @a_kernel2() {
   ret void
 }
 
-; GCN-ASM:                .text
-; GCN-ASM-NEXT:           .globl  a_function
+; GCN-ASM:                .globl  a_function
 ; GCN-ASM-NEXT:           .p2align        2
 ; GCN-ASM-NEXT:           .type   a_function,@function
 
@@ -34,46 +34,48 @@ define amdgpu_kernel void @a_kernel2() {
 ; GCN:                    s_setpc_b64
 ; GCN-ASM-NEXT:   [[END_LABEL3:\.Lfunc_end.*]]:
 ; GCN-ASM-NEXT:           .size   a_function, [[END_LABEL3]]-a_function
-; GFX10-ASM:              .p2alignl 6, 3214868480
-; GFX10-ASM-NEXT:         .fill 32, 4, 3214868480
+; GFX10END-ASM:           .p2alignl 6, 3214868480
+; GFX10END-ASM-NEXT:      .fill 32, 4, 3214868480
+; GFX10NOEND-NOT:         .fill
 
-; GFX10-OBJ-NEXT:         s_code_end
+; GFX10NOEND-OBJ-NOT:     s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
 
-; GFX10-OBJ:              s_code_end // 000000000140:
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
+; GFX10END-OBJ:           s_code_end // 000000000140:
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
 
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
 
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
 
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
-; GFX10-OBJ-NEXT:         s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
+; GFX10END-OBJ-NEXT:      s_code_end
 
 define void @a_function() {
   ret void
Unnamed repository; edit this file 'description' to name the repository.