Skip to content

Commit f8b4182

Browse files
KeenutsKeenuts
authored
Revert "[SPIR-V] Fixup storage class for global private (#116636)" (#118312)
This reverts commit aa7fe1c.
1 parent 071da92 commit f8b4182

File tree

20 files changed

+48
-127
lines changed

20 files changed

+48
-127
lines changed

‎clang/include/clang/Basic/AddressSpaces.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ enum class LangAS : unsigned {
5858

5959
// HLSL specific address spaces.
6060
hlsl_groupshared,
61-
hlsl_private,
6261

6362
// Wasm specific address spaces.
6463
wasm_funcref,

‎clang/lib/AST/TypePrinter.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2553,8 +2553,6 @@ std::string Qualifiers::getAddrSpaceAsString(LangAS AS) {
25532553
return "__funcref";
25542554
case LangAS::hlsl_groupshared:
25552555
return "groupshared";
2556-
case LangAS::hlsl_private:
2557-
return "hlsl_private";
25582556
default:
25592557
return std::to_string(toTargetAddressSpace(AS));
25602558
}

‎clang/lib/Basic/TargetInfo.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ static const LangASMap FakeAddrSpaceMap = {
4747
11, // ptr32_uptr
4848
12, // ptr64
4949
13, // hlsl_groupshared
50-
14, // hlsl_private
5150
20, // wasm_funcref
5251
};
5352

‎clang/lib/Basic/Targets/AArch64.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ static const unsigned ARM64AddrSpaceMap[] = {
4444
static_cast<unsigned>(AArch64AddrSpace::ptr32_uptr),
4545
static_cast<unsigned>(AArch64AddrSpace::ptr64),
4646
0, // hlsl_groupshared
47-
0, // hlsl_private
4847
// Wasm address space values for this target are dummy values,
4948
// as it is only enabled for Wasm targets.
5049
20, // wasm_funcref

‎clang/lib/Basic/Targets/AMDGPU.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ const LangASMap AMDGPUTargetInfo::AMDGPUDefIsGenMap = {
5959
llvm::AMDGPUAS::FLAT_ADDRESS, // ptr32_uptr
6060
llvm::AMDGPUAS::FLAT_ADDRESS, // ptr64
6161
llvm::AMDGPUAS::FLAT_ADDRESS, // hlsl_groupshared
62-
llvm::AMDGPUAS::FLAT_ADDRESS, // hlsl_private
6362
};
6463

6564
const LangASMap AMDGPUTargetInfo::AMDGPUDefIsPrivMap = {
@@ -84,7 +83,6 @@ const LangASMap AMDGPUTargetInfo::AMDGPUDefIsPrivMap = {
8483
llvm::AMDGPUAS::FLAT_ADDRESS, // ptr32_uptr
8584
llvm::AMDGPUAS::FLAT_ADDRESS, // ptr64
8685
llvm::AMDGPUAS::FLAT_ADDRESS, // hlsl_groupshared
87-
llvm::AMDGPUAS::FLAT_ADDRESS, // hlsl_private
8886

8987
};
9088
} // namespace targets

‎clang/lib/Basic/Targets/DirectX.h

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@ static const unsigned DirectXAddrSpaceMap[] = {
3333
0, // cuda_constant
3434
0, // cuda_shared
3535
// SYCL address space values for this map are dummy
36-
0, // sycl_global
37-
0, // sycl_global_device
38-
0, // sycl_global_host
39-
0, // sycl_local
40-
0, // sycl_private
41-
0, // ptr32_sptr
42-
0, // ptr32_uptr
43-
0, // ptr64
44-
3, // hlsl_groupshared
45-
10, // hlsl_private
36+
0, // sycl_global
37+
0, // sycl_global_device
38+
0, // sycl_global_host
39+
0, // sycl_local
40+
0, // sycl_private
41+
0, // ptr32_sptr
42+
0, // ptr32_uptr
43+
0, // ptr64
44+
3, // hlsl_groupshared
4645
// Wasm address space values for this target are dummy values,
4746
// as it is only enabled for Wasm targets.
4847
20, // wasm_funcref

‎clang/lib/Basic/Targets/NVPTX.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ static const unsigned NVPTXAddrSpaceMap[] = {
4646
0, // ptr32_uptr
4747
0, // ptr64
4848
0, // hlsl_groupshared
49-
0, // hlsl_private
5049
// Wasm address space values for this target are dummy values,
5150
// as it is only enabled for Wasm targets.
5251
20, // wasm_funcref

‎clang/lib/Basic/Targets/SPIR.h

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@ static const unsigned SPIRDefIsPrivMap[] = {
3838
0, // cuda_constant
3939
0, // cuda_shared
4040
// SYCL address space values for this map are dummy
41-
0, // sycl_global
42-
0, // sycl_global_device
43-
0, // sycl_global_host
44-
0, // sycl_local
45-
0, // sycl_private
46-
0, // ptr32_sptr
47-
0, // ptr32_uptr
48-
0, // ptr64
49-
0, // hlsl_groupshared
50-
10, // hlsl_private
41+
0, // sycl_global
42+
0, // sycl_global_device
43+
0, // sycl_global_host
44+
0, // sycl_local
45+
0, // sycl_private
46+
0, // ptr32_sptr
47+
0, // ptr32_uptr
48+
0, // ptr64
49+
0, // hlsl_groupshared
5150
// Wasm address space values for this target are dummy values,
5251
// as it is only enabled for Wasm targets.
5352
20, // wasm_funcref
@@ -70,18 +69,17 @@ static const unsigned SPIRDefIsGenMap[] = {
7069
// cuda_constant pointer can be casted to default/"flat" pointer, but in
7170
// SPIR-V casts between constant and generic pointers are not allowed. For
7271
// this reason cuda_constant is mapped to SPIR-V CrossWorkgroup.
73-
1, // cuda_constant
74-
3, // cuda_shared
75-
1, // sycl_global
76-
5, // sycl_global_device
77-
6, // sycl_global_host
78-
3, // sycl_local
79-
0, // sycl_private
80-
0, // ptr32_sptr
81-
0, // ptr32_uptr
82-
0, // ptr64
83-
0, // hlsl_groupshared
84-
10, // hlsl_private
72+
1, // cuda_constant
73+
3, // cuda_shared
74+
1, // sycl_global
75+
5, // sycl_global_device
76+
6, // sycl_global_host
77+
3, // sycl_local
78+
0, // sycl_private
79+
0, // ptr32_sptr
80+
0, // ptr32_uptr
81+
0, // ptr64
82+
0, // hlsl_groupshared
8583
// Wasm address space values for this target are dummy values,
8684
// as it is only enabled for Wasm targets.
8785
20, // wasm_funcref

‎clang/lib/Basic/Targets/SystemZ.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ static const unsigned ZOSAddressMap[] = {
4242
1, // ptr32_uptr
4343
0, // ptr64
4444
0, // hlsl_groupshared
45-
0, // hlsl_private
4645
0 // wasm_funcref
4746
};
4847

‎clang/lib/Basic/Targets/TCE.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ static const unsigned TCEOpenCLAddrSpaceMap[] = {
5151
0, // ptr32_uptr
5252
0, // ptr64
5353
0, // hlsl_groupshared
54-
0, // hlsl_private
5554
// Wasm address space values for this target are dummy values,
5655
// as it is only enabled for Wasm targets.
5756
20, // wasm_funcref

‎clang/lib/Basic/Targets/WebAssembly.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ static const unsigned WebAssemblyAddrSpaceMap[] = {
4242
0, // ptr32_uptr
4343
0, // ptr64
4444
0, // hlsl_groupshared
45-
0, // hlsl_private
4645
20, // wasm_funcref
4746
};
4847

‎clang/lib/Basic/Targets/X86.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ static const unsigned X86AddrSpaceMap[] = {
4646
271, // ptr32_uptr
4747
272, // ptr64
4848
0, // hlsl_groupshared
49-
0, // hlsl_private
5049
// Wasm address space values for this target are dummy values,
5150
// as it is only enabled for Wasm targets.
5251
20, // wasm_funcref

‎clang/test/SemaTemplate/address_space-dependent.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void neg() {
4343

4444
template <long int I>
4545
void tooBig() {
46-
__attribute__((address_space(I))) int *bounds; // expected-error {{address space is larger than the maximum supported (8388585)}}
46+
__attribute__((address_space(I))) int *bounds; // expected-error {{address space is larger than the maximum supported (8388586)}}
4747
}
4848

4949
template <long int I>
@@ -102,7 +102,7 @@ int main() {
102102
HasASTemplateFields<1> HASTF;
103103
neg<-1>(); // expected-note {{in instantiation of function template specialization 'neg<-1>' requested here}}
104104
correct<0x7FFFE9>();
105-
tooBig<8388651>(); // expected-note {{in instantiation of function template specialization 'tooBig<8388651L>' requested here}}
105+
tooBig<8388650>(); // expected-note {{in instantiation of function template specialization 'tooBig<8388650L>' requested here}}
106106

107107
__attribute__((address_space(1))) char *x;
108108
__attribute__((address_space(2))) char *y;

‎llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,16 +1460,6 @@ bool SPIRVInstructionSelector::selectAddrSpaceCast(Register ResVReg,
14601460
.addUse(SrcPtr)
14611461
.constrainAllUses(TII, TRI, RBI);
14621462

1463-
if ((SrcSC == SPIRV::StorageClass::Function &&
1464-
DstSC == SPIRV::StorageClass::Private) ||
1465-
(DstSC == SPIRV::StorageClass::Function &&
1466-
SrcSC == SPIRV::StorageClass::Private)) {
1467-
return BuildMI(BB, I, DL, TII.get(TargetOpcode::COPY))
1468-
.addDef(ResVReg)
1469-
.addUse(SrcPtr)
1470-
.constrainAllUses(TII, TRI, RBI);
1471-
}
1472-
14731463
// Casting from an eligible pointer to Generic.
14741464
if (DstSC == SPIRV::StorageClass::Generic && isGenericCastablePtr(SrcSC))
14751465
return selectUnOp(ResVReg, ResType, I, SPIRV::OpPtrCastToGeneric);
@@ -3471,7 +3461,11 @@ bool SPIRVInstructionSelector::selectGlobalValue(
34713461
if (HasInit && !Init)
34723462
return true;
34733463

3474-
bool HasLnkTy = GV->getLinkage() != GlobalValue::InternalLinkage;
3464+
unsigned AddrSpace = GV->getAddressSpace();
3465+
SPIRV::StorageClass::StorageClass Storage =
3466+
addressSpaceToStorageClass(AddrSpace, STI);
3467+
bool HasLnkTy = GV->getLinkage() != GlobalValue::InternalLinkage &&
3468+
Storage != SPIRV::StorageClass::Function;
34753469
SPIRV::LinkageType::LinkageType LnkType =
34763470
(GV->isDeclaration() || GV->hasAvailableExternallyLinkage())
34773471
? SPIRV::LinkageType::Import
@@ -3480,14 +3474,12 @@ bool SPIRVInstructionSelector::selectGlobalValue(
34803474
? SPIRV::LinkageType::LinkOnceODR
34813475
: SPIRV::LinkageType::Export);
34823476

3483-
const unsigned AddrSpace = GV->getAddressSpace();
3484-
SPIRV::StorageClass::StorageClass StorageClass =
3485-
addressSpaceToStorageClass(AddrSpace, STI);
3486-
SPIRVType *ResType =
3487-
GR.getOrCreateSPIRVPointerType(PointerBaseType, I, TII, StorageClass);
3488-
Register Reg = GR.buildGlobalVariable(
3489-
ResVReg, ResType, GlobalIdent, GV, StorageClass, Init,
3490-
GlobalVar->isConstant(), HasLnkTy, LnkType, MIRBuilder, true);
3477+
SPIRVType *ResType = GR.getOrCreateSPIRVPointerType(
3478+
PointerBaseType, I, TII,
3479+
addressSpaceToStorageClass(GV->getAddressSpace(), STI));
3480+
Register Reg = GR.buildGlobalVariable(ResVReg, ResType, GlobalIdent, GV,
3481+
Storage, Init, GlobalVar->isConstant(),
3482+
HasLnkTy, LnkType, MIRBuilder, true);
34913483
return Reg.isValid();
34923484
}
34933485

‎llvm/lib/Target/SPIRV/SPIRVLegalizerInfo.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ SPIRVLegalizerInfo::SPIRVLegalizerInfo(const SPIRVSubtarget &ST) {
112112
const LLT p5 =
113113
LLT::pointer(5, PSize); // Input, SPV_INTEL_usm_storage_classes (Device)
114114
const LLT p6 = LLT::pointer(6, PSize); // SPV_INTEL_usm_storage_classes (Host)
115-
const LLT p7 = LLT::pointer(7, PSize); // Input
116-
const LLT p8 = LLT::pointer(8, PSize); // Output
117-
const LLT p10 = LLT::pointer(10, PSize); // Private
118115

119116
// TODO: remove copy-pasting here by using concatenation in some way.
120117
auto allPtrsScalarsAndVectors = {
@@ -151,7 +148,7 @@ SPIRVLegalizerInfo::SPIRVLegalizerInfo(const SPIRVSubtarget &ST) {
151148
auto allFloatAndIntScalarsAndPtrs = {s8, s16, s32, s64, p0, p1,
152149
p2, p3, p4, p5, p6};
153150

154-
auto allPtrs = {p0, p1, p2, p3, p4, p5, p6, p7, p8, p10};
151+
auto allPtrs = {p0, p1, p2, p3, p4, p5, p6};
155152

156153
bool IsExtendedInts =
157154
ST.canUseExtension(

‎llvm/lib/Target/SPIRV/SPIRVUtils.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,8 @@ addressSpaceToStorageClass(unsigned AddrSpace, const SPIRVSubtarget &STI) {
207207
: SPIRV::StorageClass::CrossWorkgroup;
208208
case 7:
209209
return SPIRV::StorageClass::Input;
210-
case 8:
211-
return SPIRV::StorageClass::Output;
212210
case 9:
213211
return SPIRV::StorageClass::CodeSectionINTEL;
214-
case 10:
215-
return SPIRV::StorageClass::Private;
216212
default:
217213
report_fatal_error("Unknown address space");
218214
}

‎llvm/lib/Target/SPIRV/SPIRVUtils.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,8 @@ storageClassToAddressSpace(SPIRV::StorageClass::StorageClass SC) {
170170
return 6;
171171
case SPIRV::StorageClass::Input:
172172
return 7;
173-
case SPIRV::StorageClass::Output:
174-
return 8;
175173
case SPIRV::StorageClass::CodeSectionINTEL:
176174
return 9;
177-
case SPIRV::StorageClass::Private:
178-
return 10;
179175
default:
180176
report_fatal_error("Unable to get address space id");
181177
}

‎llvm/test/CodeGen/SPIRV/pointers/global-addrspacecast.ll

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

‎llvm/test/CodeGen/SPIRV/pointers/variables-storage-class-vk.ll

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

‎llvm/test/CodeGen/SPIRV/pointers/variables-storage-class.ll

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
11
; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s
22
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val %}
33

4-
; CHECK-DAG: %[[#U8:]] = OpTypeInt 8 0
5-
; CHECK-DAG: %[[#U32:]] = OpTypeInt 32 0
6-
7-
; CHECK-DAG: %[[#TYPE:]] = OpTypePointer CrossWorkgroup %[[#U8]]
8-
; CHECK-DAG: %[[#VAL:]] = OpConstantNull %[[#TYPE]]
9-
; CHECK-DAG: %[[#VTYPE:]] = OpTypePointer CrossWorkgroup %[[#TYPE]]
10-
; CHECK-DAG: %[[#PTR:]] = OpVariable %[[#VTYPE]] CrossWorkgroup %[[#VAL]]
114
@Ptr = addrspace(1) global ptr addrspace(1) null
12-
13-
; CHECK-DAG: %[[#VAL:]] = OpConstant %[[#U32]] 123
14-
; CHECK-DAG: %[[#VTYPE:]] = OpTypePointer UniformConstant %[[#U32]]
15-
; CHECK-DAG: %[[#INIT:]] = OpVariable %[[#VTYPE]] UniformConstant %[[#VAL]]
165
@Init = private addrspace(2) constant i32 123
176

18-
; CHECK-DAG: %[[#VAL:]] = OpConstant %[[#U32]] 456
19-
; CHECK-DAG: %[[#VTYPE:]] = OpTypePointer Private %[[#U32]]
20-
; CHECK-DAG: %[[#]] = OpVariable %[[#VTYPE]] Private %[[#VAL]]
21-
@PrivInternal = internal addrspace(10) global i32 456
7+
; CHECK-DAG: %[[#PTR:]] = OpVariable %[[#]] UniformConstant %[[#]]
8+
; CHECK-DAG: %[[#INIT:]] = OpVariable %[[#]] CrossWorkgroup %[[#]]
9+
10+
; CHECK: %[[#]] = OpLoad %[[#]] %[[#INIT]] Aligned 8
11+
; CHECK: OpCopyMemorySized %[[#]] %[[#PTR]] %[[#]] Aligned 4
2212

2313
define spir_kernel void @Foo() {
24-
; CHECK: %[[#]] = OpLoad %[[#]] %[[#PTR]] Aligned 8
2514
%l = load ptr addrspace(1), ptr addrspace(1) @Ptr, align 8
26-
; CHECK: OpCopyMemorySized %[[#]] %[[#INIT]] %[[#]] Aligned 4
2715
call void @llvm.memcpy.p1.p2.i64(ptr addrspace(1) align 4 %l, ptr addrspace(2) align 1 @Init, i64 4, i1 false)
28-
2916
ret void
3017
}
3118

0 commit comments

Comments
 (0)