Skip to content

Commit 50ad347

Browse files
Disable ReplaceLDS pass, patch up tests to match
Most tests passed with an extra argument to explicitly enable the pass. One does not, deleted it as part of this change. I can't see why the codegen would be different between default on and default off but switched on. It can be retrieved from the project history. This would be a revert, but git revert was not clean. Disabling the pass and leaving it in tree is less likely to cause breakage elsewhere than patching up the git revert conflicts on unfamiliar code. It'll be landed without review, as @hsmhsm is believed unavailable at present. Differential Revision: https://reviews.llvm.org/D104962
1 parent 45f6d55 commit 50ad347

18 files changed

+16
-233
lines changed

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static cl::opt<bool> EnableStructurizerWorkarounds(
200200

201201
static cl::opt<bool> EnableLDSReplaceWithPointer(
202202
"amdgpu-enable-lds-replace-with-pointer",
203-
cl::desc("Enable LDS replace with pointer pass"), cl::init(true),
203+
cl::desc("Enable LDS replace with pointer pass"), cl::init(false),
204204
cl::Hidden);
205205

206206
static cl::opt<bool, true> EnableLowerModuleLDS(

llvm/test/CodeGen/AMDGPU/llc-pipeline.ll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
; GCN-O0-NEXT: Inliner for always_inline functions
4343
; GCN-O0-NEXT: A No-Op Barrier Pass
4444
; GCN-O0-NEXT: Lower OpenCL enqueued blocks
45-
; GCN-O0-NEXT: Replace within non-kernel function use of LDS with pointer
4645
; GCN-O0-NEXT: Lower uses of LDS variables from non-kernel functions
4746
; GCN-O0-NEXT: FunctionPass Manager
4847
; GCN-O0-NEXT: Dominator Tree Construction
@@ -193,7 +192,6 @@
193192
; GCN-O1-NEXT: Inliner for always_inline functions
194193
; GCN-O1-NEXT: A No-Op Barrier Pass
195194
; GCN-O1-NEXT: Lower OpenCL enqueued blocks
196-
; GCN-O1-NEXT: Replace within non-kernel function use of LDS with pointer
197195
; GCN-O1-NEXT: Lower uses of LDS variables from non-kernel functions
198196
; GCN-O1-NEXT: FunctionPass Manager
199197
; GCN-O1-NEXT: Infer address spaces
@@ -442,7 +440,6 @@
442440
; GCN-O1-OPTS-NEXT: Inliner for always_inline functions
443441
; GCN-O1-OPTS-NEXT: A No-Op Barrier Pass
444442
; GCN-O1-OPTS-NEXT: Lower OpenCL enqueued blocks
445-
; GCN-O1-OPTS-NEXT: Replace within non-kernel function use of LDS with pointer
446443
; GCN-O1-OPTS-NEXT: Lower uses of LDS variables from non-kernel functions
447444
; GCN-O1-OPTS-NEXT: FunctionPass Manager
448445
; GCN-O1-OPTS-NEXT: Infer address spaces
@@ -723,7 +720,6 @@
723720
; GCN-O2-NEXT: Inliner for always_inline functions
724721
; GCN-O2-NEXT: A No-Op Barrier Pass
725722
; GCN-O2-NEXT: Lower OpenCL enqueued blocks
726-
; GCN-O2-NEXT: Replace within non-kernel function use of LDS with pointer
727723
; GCN-O2-NEXT: Lower uses of LDS variables from non-kernel functions
728724
; GCN-O2-NEXT: FunctionPass Manager
729725
; GCN-O2-NEXT: Infer address spaces
@@ -1005,7 +1001,6 @@
10051001
; GCN-O3-NEXT: Inliner for always_inline functions
10061002
; GCN-O3-NEXT: A No-Op Barrier Pass
10071003
; GCN-O3-NEXT: Lower OpenCL enqueued blocks
1008-
; GCN-O3-NEXT: Replace within non-kernel function use of LDS with pointer
10091004
; GCN-O3-NEXT: Lower uses of LDS variables from non-kernel functions
10101005
; GCN-O3-NEXT: FunctionPass Manager
10111006
; GCN-O3-NEXT: Infer address spaces

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-call-diamond-shape.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-call-selected_functions.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-ignore-global-scope-use.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-ignore-inline-asm-call.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-ignore-kernel-only-used-lds.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION ;
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-ignore-not-reachable-lds.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION ;
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-ignore-small-lds.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION ;
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-indirect-call-diamond-shape.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-indirect-call-selected_functions.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-indirect-call-signature-match.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-lds-offsets.ll

Lines changed: 0 additions & 212 deletions
This file was deleted.

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-use-multiple-lds.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-use-same-lds.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-use-within-const-expr1.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-use-within-const-expr2.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
; There is one lds global defined here, and this lds is used within a single non-kernel

llvm/test/CodeGen/AMDGPU/replace-lds-by-ptr-use-within-phi-inst.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer < %s | FileCheck %s
1+
; RUN: opt -S -mtriple=amdgcn-- -amdgpu-replace-lds-use-with-pointer -amdgpu-enable-lds-replace-with-pointer=true < %s | FileCheck %s
22

33
; DESCRIPTION:
44
;

0 commit comments

Comments
 (0)