Skip to content

Commit fb2ed73

Browse files
shiltianshiltian
committed
[Attributor] Use more appropriate approach to check flat address space
1 parent e6fb6d5 commit fb2ed73

File tree

10 files changed

+51
-36
lines changed

10 files changed

+51
-36
lines changed

‎llvm/include/llvm/Transforms/IPO/Attributor.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6267,11 +6267,12 @@ struct AAAddressSpace : public StateWrapper<BooleanState, AbstractAttribute> {
62676267
return (AA->getIdAddr() == &ID);
62686268
}
62696269

6270-
// No address space which indicates the associated value is dead.
6271-
static const uint32_t NoAddressSpace = ~0U;
6272-
62736270
/// Unique ID (due to the unique address)
62746271
static const char ID;
6272+
6273+
protected:
6274+
// Invalid address space which indicates the associated value is dead.
6275+
static const uint32_t InvalidAddressSpace = ~0U;
62756276
};
62766277

62776278
struct AAAllocationInfo : public StateWrapper<BooleanState, AbstractAttribute> {

‎llvm/lib/Transforms/IPO/AttributorAttributes.cpp‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12571,8 +12571,19 @@ struct AAAddressSpaceImpl : public AAAddressSpace {
1257112571
void initialize(Attributor &A) override {
1257212572
assert(getAssociatedType()->isPtrOrPtrVectorTy() &&
1257312573
"Associated value is not a pointer");
12574-
if (getAssociatedType()->getPointerAddressSpace())
12574+
12575+
if (!A.getInfoCache().getDL().getFlatAddressSpace().has_value()) {
12576+
indicatePessimisticFixpoint();
12577+
return;
12578+
}
12579+
12580+
unsigned FlatAS = A.getInfoCache().getDL().getFlatAddressSpace().value();
12581+
unsigned AS = getAssociatedType()->getPointerAddressSpace();
12582+
if (AS != FlatAS) {
12583+
[[maybe_unused]] bool R = takeAddressSpace(AS);
12584+
assert(R && "The take should happen");
1257512585
indicateOptimisticFixpoint();
12586+
}
1257612587
}
1257712588

1257812589
ChangeStatus updateImpl(Attributor &A) override {
@@ -12594,12 +12605,13 @@ struct AAAddressSpaceImpl : public AAAddressSpace {
1259412605

1259512606
/// See AbstractAttribute::manifest(...).
1259612607
ChangeStatus manifest(Attributor &A) override {
12597-
Value *AssociatedValue = &getAssociatedValue();
12598-
Value *OriginalValue = peelAddrspacecast(AssociatedValue);
12599-
if (getAddressSpace() == NoAddressSpace ||
12608+
if (getAddressSpace() == InvalidAddressSpace ||
1260012609
getAddressSpace() == getAssociatedType()->getPointerAddressSpace())
1260112610
return ChangeStatus::UNCHANGED;
1260212611

12612+
Value *AssociatedValue = &getAssociatedValue();
12613+
Value *OriginalValue = peelAddrspacecast(AssociatedValue);
12614+
1260312615
PointerType *NewPtrTy =
1260412616
PointerType::get(getAssociatedType()->getContext(), getAddressSpace());
1260512617
bool UseOriginalValue =
@@ -12646,17 +12658,17 @@ struct AAAddressSpaceImpl : public AAAddressSpace {
1264612658
if (!isValidState())
1264712659
return "addrspace(<invalid>)";
1264812660
return "addrspace(" +
12649-
(AssumedAddressSpace == NoAddressSpace
12661+
(AssumedAddressSpace == InvalidAddressSpace
1265012662
? "none"
1265112663
: std::to_string(AssumedAddressSpace)) +
1265212664
")";
1265312665
}
1265412666

1265512667
private:
12656-
uint32_t AssumedAddressSpace = NoAddressSpace;
12668+
uint32_t AssumedAddressSpace = InvalidAddressSpace;
1265712669

1265812670
bool takeAddressSpace(uint32_t AS) {
12659-
if (AssumedAddressSpace == NoAddressSpace) {
12671+
if (AssumedAddressSpace == InvalidAddressSpace) {
1266012672
AssumedAddressSpace = AS;
1266112673
return true;
1266212674
}

‎llvm/test/CodeGen/AMDGPU/simple-indirect-call.ll‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ define amdgpu_kernel void @test_simple_indirect_call() {
3434
; ATTRIBUTOR_GCN-LABEL: define {{[^@]+}}@test_simple_indirect_call
3535
; ATTRIBUTOR_GCN-SAME: () #[[ATTR1:[0-9]+]] {
3636
; ATTRIBUTOR_GCN-NEXT: [[FPTR:%.*]] = alloca ptr, align 8, addrspace(5)
37-
; ATTRIBUTOR_GCN-NEXT: store ptr @indirect, ptr addrspace(5) [[FPTR]], align 8
38-
; ATTRIBUTOR_GCN-NEXT: [[FP:%.*]] = load ptr, ptr addrspace(5) [[FPTR]], align 8
37+
; ATTRIBUTOR_GCN-NEXT: [[FPTR_CAST:%.*]] = addrspacecast ptr addrspace(5) [[FPTR]] to ptr
38+
; ATTRIBUTOR_GCN-NEXT: store ptr @indirect, ptr [[FPTR_CAST]], align 8
39+
; ATTRIBUTOR_GCN-NEXT: [[FP:%.*]] = load ptr, ptr [[FPTR_CAST]], align 8
3940
; ATTRIBUTOR_GCN-NEXT: call void @indirect()
4041
; ATTRIBUTOR_GCN-NEXT: ret void
4142
;

‎llvm/test/Transforms/Attributor/address_space_info.ll‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --check-attributes --check-globals --prefix-filecheck-ir-name true
2-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK
2+
; RUN: opt -mtriple=amdgcn-amd-amdhsa -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefix=CHECK
3+
4+
; REQUIRES: amdgpu-registered-target
35

46
@dst = dso_local addrspace(1) externally_initialized global i32 0, align 4
57
@g1 = dso_local addrspace(1) externally_initialized global ptr null, align 4

‎llvm/test/Transforms/Attributor/memory_locations_gpu.ll‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ define i32 @test_const_as_global2() {
2929
; CHECK: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
3030
; CHECK-LABEL: define {{[^@]+}}@test_const_as_global2
3131
; CHECK-SAME: () #[[ATTR1]] {
32-
; CHECK-NEXT: [[L2:%.*]] = load i32, ptr addrspace(4) @G, align 4
32+
; CHECK-NEXT: [[L2:%.*]] = load i32, ptr addrspacecast (ptr addrspace(4) @G to ptr), align 4
3333
; CHECK-NEXT: ret i32 [[L2]]
3434
;
3535
%l2 = load i32, ptr addrspacecast (ptr addrspace(4) @G to ptr)
@@ -41,7 +41,8 @@ define i32 @test_const_as_call1() {
4141
; CHECK-LABEL: define {{[^@]+}}@test_const_as_call1
4242
; CHECK-SAME: () #[[ATTR2:[0-9]+]] {
4343
; CHECK-NEXT: [[P1:%.*]] = call ptr addrspace(4) @ptr_to_const() #[[ATTR4:[0-9]+]]
44-
; CHECK-NEXT: [[L1:%.*]] = load i32, ptr addrspace(4) [[P1]], align 4
44+
; CHECK-NEXT: [[C1:%.*]] = addrspacecast ptr addrspace(4) [[P1]] to ptr
45+
; CHECK-NEXT: [[L1:%.*]] = load i32, ptr [[C1]], align 4
4546
; CHECK-NEXT: ret i32 [[L1]]
4647
;
4748
%p1 = call ptr addrspace(4) @ptr_to_const()
@@ -71,7 +72,8 @@ define i32 @test_shared_as_call1() {
7172
; CHECK-LABEL: define {{[^@]+}}@test_shared_as_call1
7273
; CHECK-SAME: () #[[ATTR2]] {
7374
; CHECK-NEXT: [[P1:%.*]] = call ptr addrspace(3) @ptr_to_shared() #[[ATTR4]]
74-
; CHECK-NEXT: [[L1:%.*]] = load i32, ptr addrspace(3) [[P1]], align 4
75+
; CHECK-NEXT: [[C1:%.*]] = addrspacecast ptr addrspace(3) [[P1]] to ptr
76+
; CHECK-NEXT: [[L1:%.*]] = load i32, ptr [[C1]], align 4
7577
; CHECK-NEXT: ret i32 [[L1]]
7678
;
7779
%p1 = call ptr addrspace(3) @ptr_to_shared()

‎llvm/test/Transforms/Attributor/nocapture-1.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ define i32 @nc1_addrspace(ptr %q, ptr addrspace(1) %p, i1 %b) {
257257
; TUNIT-NEXT: [[TMP:%.*]] = addrspacecast ptr addrspace(1) [[P]] to ptr
258258
; TUNIT-NEXT: [[TMP2:%.*]] = select i1 [[B]], ptr [[TMP]], ptr [[Q]]
259259
; TUNIT-NEXT: [[VAL:%.*]] = load i32, ptr [[TMP2]], align 4
260-
; TUNIT-NEXT: store i32 0, ptr addrspace(1) [[P]], align 4
260+
; TUNIT-NEXT: store i32 0, ptr [[TMP]], align 4
261261
; TUNIT-NEXT: store ptr [[Q]], ptr @g, align 8
262262
; TUNIT-NEXT: ret i32 [[VAL]]
263263
;
@@ -272,7 +272,7 @@ define i32 @nc1_addrspace(ptr %q, ptr addrspace(1) %p, i1 %b) {
272272
; CGSCC-NEXT: [[TMP:%.*]] = addrspacecast ptr addrspace(1) [[P]] to ptr
273273
; CGSCC-NEXT: [[TMP2:%.*]] = select i1 [[B]], ptr [[TMP]], ptr [[Q]]
274274
; CGSCC-NEXT: [[VAL:%.*]] = load i32, ptr [[TMP2]], align 4
275-
; CGSCC-NEXT: store i32 0, ptr addrspace(1) [[P]], align 4
275+
; CGSCC-NEXT: store i32 0, ptr [[TMP]], align 4
276276
; CGSCC-NEXT: store ptr [[Q]], ptr @g, align 8
277277
; CGSCC-NEXT: ret i32 [[VAL]]
278278
;

‎llvm/test/Transforms/Attributor/reduced/openmp_opt_constant_type_crash.ll‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ cond.end: ; preds = %cond.true, %entry
116116
; CHECK-LABEL: define {{[^@]+}}@_ZN6Kokkos4Impl14SubviewExtentsILj2ELj1EE3setIJLm0ELm0EEJiEEEbjjRKNS0_13ViewDimensionIJXspT_EEEENS0_5ALL_tEDpT0_.internalized
117117
; CHECK-SAME: (ptr nocapture writeonly [[THIS:%.*]]) #[[ATTR1]] {
118118
; CHECK-NEXT: entry:
119-
; CHECK-NEXT: [[TMP0:%.*]] = addrspacecast ptr [[THIS]] to ptr addrspace(5)
120119
; CHECK-NEXT: ret i1 false
121120
;
122121
;

‎llvm/test/Transforms/Attributor/value-simplify.ll‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,7 @@ define void @user() {
838838
; TUNIT: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(write)
839839
; TUNIT-LABEL: define {{[^@]+}}@user
840840
; TUNIT-SAME: () #[[ATTR5]] {
841-
; TUNIT-NEXT: [[TMP1:%.*]] = addrspacecast ptr addrspacecast (ptr addrspace(3) @ConstAS3Ptr to ptr) to ptr addrspace(3)
842-
; TUNIT-NEXT: store i32 0, ptr addrspace(3) [[TMP1]], align 4
841+
; TUNIT-NEXT: store i32 0, ptr addrspacecast (ptr addrspace(3) @ConstAS3Ptr to ptr), align 4
843842
; TUNIT-NEXT: ret void
844843
;
845844
; CGSCC: Function Attrs: mustprogress nofree nosync nounwind willreturn memory(write)

‎llvm/test/Transforms/OpenMP/nested_parallelism.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ define weak_odr protected void @__omp_offloading_10302_bd7e0_main_l13(ptr %dyn,
6060
; CHECK-NEXT: br i1 [[TMP3]], label [[REGION_GUARDED_I:%.*]], label [[_Z3FOOI_INTERNALIZED_EXIT:%.*]]
6161
; CHECK: region.guarded.i:
6262
; CHECK-NEXT: [[I_ADDR_SROA_0_0_EXTRACT_TRUNC:%.*]] = trunc i64 [[I:%.*]] to i32
63-
; CHECK-NEXT: store i32 [[I_ADDR_SROA_0_0_EXTRACT_TRUNC]], ptr addrspace(3) @i_shared, align 16
63+
; CHECK-NEXT: store i32 [[I_ADDR_SROA_0_0_EXTRACT_TRUNC]], ptr addrspacecast (ptr addrspace(3) @i_shared to ptr), align 16
6464
; CHECK-NEXT: br label [[_Z3FOOI_INTERNALIZED_EXIT]]
6565
; CHECK: _Z3fooi.internalized.exit:
6666
; CHECK-NEXT: tail call void @__kmpc_barrier_simple_spmd(ptr nonnull @[[GLOB1]], i32 [[TMP2]]) #[[ATTR2]]
@@ -140,7 +140,7 @@ define weak_odr protected void @__omp_offloading_10302_bd7e0_main_l16(ptr %dyn,
140140
; CHECK-NEXT: [[I_ADDR_SROA_0_0_EXTRACT_TRUNC:%.*]] = trunc i64 [[I:%.*]] to i32
141141
; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 8, ptr nonnull [[CAPTURED_VARS_ADDRS_I]])
142142
; CHECK-NEXT: [[TMP1:%.*]] = tail call i32 @__kmpc_global_thread_num(ptr nonnull @[[GLOB1]]) #[[ATTR2]]
143-
; CHECK-NEXT: store i32 [[I_ADDR_SROA_0_0_EXTRACT_TRUNC]], ptr addrspace(3) @i.i_shared, align 16
143+
; CHECK-NEXT: store i32 [[I_ADDR_SROA_0_0_EXTRACT_TRUNC]], ptr addrspacecast (ptr addrspace(3) @i.i_shared to ptr), align 16
144144
; CHECK-NEXT: store ptr addrspacecast (ptr addrspace(3) @i.i_shared to ptr), ptr [[CAPTURED_VARS_ADDRS_I]], align 8
145145
; CHECK-NEXT: call void @__kmpc_parallel_51(ptr nonnull @[[GLOB1]], i32 [[TMP1]], i32 1, i32 -1, i32 -1, ptr nonnull @__omp_outlined__1, ptr nonnull @__omp_outlined__1_wrapper, ptr nonnull [[CAPTURED_VARS_ADDRS_I]], i64 1)
146146
; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 8, ptr nonnull [[CAPTURED_VARS_ADDRS_I]])

‎llvm/test/Transforms/OpenMP/spmdization_kernel_env_dep.ll‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,21 @@ define i32 @fputs() {
2727
define internal i32 @__kmpc_target_init(ptr %0, ptr %dyn) {
2828
; AMDGPU-LABEL: define {{[^@]+}}@__kmpc_target_init
2929
; AMDGPU-SAME: (ptr [[TMP0:%.*]], ptr [[DYN:%.*]]) #[[ATTR1:[0-9]+]] {
30-
; AMDGPU-NEXT: [[TMP2:%.*]] = addrspacecast ptr getelementptr (i8, ptr addrspacecast (ptr addrspace(1) @__omp_offloading_10302_b20a40e_main_l4_kernel_environment to ptr), i64 2) to ptr addrspace(1)
31-
; AMDGPU-NEXT: [[TMP3:%.*]] = load i8, ptr addrspace(1) [[TMP2]], align 2
32-
; AMDGPU-NEXT: [[TMP4:%.*]] = and i8 [[TMP3]], 2
33-
; AMDGPU-NEXT: [[TMP5:%.*]] = icmp ne i8 [[TMP4]], 0
34-
; AMDGPU-NEXT: [[TMP6:%.*]] = tail call i32 @llvm.amdgcn.workitem.id.x() #[[ATTR3:[0-9]+]]
35-
; AMDGPU-NEXT: [[TMP7:%.*]] = icmp eq i32 [[TMP6]], 0
36-
; AMDGPU-NEXT: [[OR_COND:%.*]] = select i1 [[TMP5]], i1 [[TMP7]], i1 false
37-
; AMDGPU-NEXT: br i1 [[OR_COND]], label [[TMP8:%.*]], label [[TMP9:%.*]]
38-
; AMDGPU: 8:
30+
; AMDGPU-NEXT: [[TMP2:%.*]] = load i8, ptr getelementptr (i8, ptr addrspacecast (ptr addrspace(1) @__omp_offloading_10302_b20a40e_main_l4_kernel_environment to ptr), i64 2), align 2
31+
; AMDGPU-NEXT: [[TMP3:%.*]] = and i8 [[TMP2]], 2
32+
; AMDGPU-NEXT: [[TMP4:%.*]] = icmp ne i8 [[TMP3]], 0
33+
; AMDGPU-NEXT: [[TMP5:%.*]] = tail call i32 @llvm.amdgcn.workitem.id.x() #[[ATTR3:[0-9]+]]
34+
; AMDGPU-NEXT: [[TMP6:%.*]] = icmp eq i32 [[TMP5]], 0
35+
; AMDGPU-NEXT: [[OR_COND:%.*]] = select i1 [[TMP4]], i1 [[TMP6]], i1 false
36+
; AMDGPU-NEXT: br i1 [[OR_COND]], label [[TMP7:%.*]], label [[TMP8:%.*]]
37+
; AMDGPU: 7:
3938
; AMDGPU-NEXT: store i8 0, ptr addrspace(3) null, align 2147483648
40-
; AMDGPU-NEXT: br label [[TMP9]]
39+
; AMDGPU-NEXT: br label [[TMP8]]
40+
; AMDGPU: 8:
41+
; AMDGPU-NEXT: br label [[TMP10:%.*]]
4142
; AMDGPU: 9:
42-
; AMDGPU-NEXT: br label [[TMP11:%.*]]
43-
; AMDGPU: 10:
4443
; AMDGPU-NEXT: unreachable
45-
; AMDGPU: 11:
44+
; AMDGPU: 10:
4645
; AMDGPU-NEXT: ret i32 0
4746
;
4847
%2 = getelementptr %struct.ConfigurationEnvironmentTy.8, ptr %0, i64 0, i32 2

0 commit comments

Comments
 (0)