Skip to content

Commit 7be8ec1

Browse files
DominikAdamskiDominikAdamski
committed
Revert "Applied review remarks"
This reverts commit 0d2ea7f.
1 parent 0d2ea7f commit 7be8ec1

File tree

5 files changed

+56
-92
lines changed

5 files changed

+56
-92
lines changed

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

Lines changed: 40 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -37,56 +37,50 @@ static const char *const DataLayoutStringAMDGCN =
3737
"-ni:7:8";
3838

3939
const LangASMap AMDGPUTargetInfo::AMDGPUDefIsGenMap = {
40-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // Default
41-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Global), // opencl_global
42-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Local), // opencl_local
43-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant), // opencl_constant
44-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Private), // opencl_private
45-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // opencl_generic
46-
static_cast<unsigned>(
47-
llvm::AMDGPU::AddrSpace::Global), // opencl_global_device
48-
static_cast<unsigned>(
49-
llvm::AMDGPU::AddrSpace::Global), // opencl_global_host
50-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Global), // cuda_device
51-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant), // cuda_constant
52-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Local), // cuda_shared
53-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Global), // sycl_global
54-
static_cast<unsigned>(
55-
llvm::AMDGPU::AddrSpace::Global), // sycl_global_device
56-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Global), // sycl_global_host
57-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Local), // sycl_local
58-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Private), // sycl_private
59-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // ptr32_sptr
60-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // ptr32_uptr
61-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // ptr64
62-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // hlsl_groupshared
40+
llvm::AMDGPU::Generic, // Default
41+
llvm::AMDGPU::Global, // opencl_global
42+
llvm::AMDGPU::Local, // opencl_local
43+
llvm::AMDGPU::Constant, // opencl_constant
44+
llvm::AMDGPU::Private, // opencl_private
45+
llvm::AMDGPU::Generic, // opencl_generic
46+
llvm::AMDGPU::Global, // opencl_global_device
47+
llvm::AMDGPU::Global, // opencl_global_host
48+
llvm::AMDGPU::Global, // cuda_device
49+
llvm::AMDGPU::Constant, // cuda_constant
50+
llvm::AMDGPU::Local, // cuda_shared
51+
llvm::AMDGPU::Global, // sycl_global
52+
llvm::AMDGPU::Global, // sycl_global_device
53+
llvm::AMDGPU::Global, // sycl_global_host
54+
llvm::AMDGPU::Local, // sycl_local
55+
llvm::AMDGPU::Private, // sycl_private
56+
llvm::AMDGPU::Generic, // ptr32_sptr
57+
llvm::AMDGPU::Generic, // ptr32_uptr
58+
llvm::AMDGPU::Generic, // ptr64
59+
llvm::AMDGPU::Generic, // hlsl_groupshared
6360
};
6461

6562
const LangASMap AMDGPUTargetInfo::AMDGPUDefIsPrivMap = {
66-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Private), // Default
67-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Global), // opencl_global
68-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Local), // opencl_local
69-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant), // opencl_constant
70-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Private), // opencl_private
71-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // opencl_generic
72-
static_cast<unsigned>(
73-
llvm::AMDGPU::AddrSpace::Global), // opencl_global_device
74-
static_cast<unsigned>(
75-
llvm::AMDGPU::AddrSpace::Global), // opencl_global_host
76-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Global), // cuda_device
77-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant), // cuda_constant
78-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Local), // cuda_shared
63+
llvm::AMDGPU::Private, // Default
64+
llvm::AMDGPU::Global, // opencl_global
65+
llvm::AMDGPU::Local, // opencl_local
66+
llvm::AMDGPU::Constant, // opencl_constant
67+
llvm::AMDGPU::Private, // opencl_private
68+
llvm::AMDGPU::Generic, // opencl_generic
69+
llvm::AMDGPU::Global, // opencl_global_device
70+
llvm::AMDGPU::Global, // opencl_global_host
71+
llvm::AMDGPU::Global, // cuda_device
72+
llvm::AMDGPU::Constant, // cuda_constant
73+
llvm::AMDGPU::Local, // cuda_shared
7974
// SYCL address space values for this map are dummy
80-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // sycl_global
81-
static_cast<unsigned>(
82-
llvm::AMDGPU::AddrSpace::Generic), // sycl_global_device
83-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // sycl_global_host
84-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // sycl_local
85-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // sycl_private
86-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // ptr32_sptr
87-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // ptr32_uptr
88-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // ptr64
89-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Generic), // hlsl_groupshared
75+
llvm::AMDGPU::Generic, // sycl_global
76+
llvm::AMDGPU::Generic, // sycl_global_device
77+
llvm::AMDGPU::Generic, // sycl_global_host
78+
llvm::AMDGPU::Generic, // sycl_local
79+
llvm::AMDGPU::Generic, // sycl_private
80+
llvm::AMDGPU::Generic, // ptr32_sptr
81+
llvm::AMDGPU::Generic, // ptr32_uptr
82+
llvm::AMDGPU::Generic, // ptr64
83+
llvm::AMDGPU::Generic, // hlsl_groupshared
9084

9185
};
9286
} // namespace targets

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "clang/Basic/TargetInfo.h"
1818
#include "clang/Basic/TargetOptions.h"
1919
#include "llvm/ADT/StringSet.h"
20-
#include "llvm/Support/AMDGPUAddrSpace.h"
2120
#include "llvm/Support/Compiler.h"
2221
#include "llvm/TargetParser/TargetParser.h"
2322
#include "llvm/TargetParser/Triple.h"
@@ -100,8 +99,7 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUTargetInfo final : public TargetInfo {
10099
return 32;
101100
unsigned TargetAS = getTargetAddressSpace(AS);
102101

103-
if (TargetAS == static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Private) ||
104-
TargetAS == static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Local))
102+
if (TargetAS == llvm::AMDGPU::Private || TargetAS == llvm::AMDGPU::Local)
105103
return 32;
106104

107105
return 64;
@@ -371,8 +369,7 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUTargetInfo final : public TargetInfo {
371369
}
372370

373371
std::optional<LangAS> getConstantAddressSpace() const override {
374-
return getLangASFromTargetAS(
375-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant));
372+
return getLangASFromTargetAS(llvm::AMDGPU::Constant);
376373
}
377374

378375
const llvm::omp::GV &getGridValue() const override {
@@ -388,7 +385,7 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUTargetInfo final : public TargetInfo {
388385

389386
/// \returns Target specific vtbl ptr address space.
390387
unsigned getVtblPtrAddressSpace() const override {
391-
return static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant);
388+
return static_cast<unsigned>(llvm::AMDGPU::Constant);
392389
}
393390

394391
/// \returns If a target requires an address within a target specific address
@@ -401,11 +398,9 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUTargetInfo final : public TargetInfo {
401398
getDWARFAddressSpace(unsigned AddressSpace) const override {
402399
const unsigned DWARF_Private = 1;
403400
const unsigned DWARF_Local = 2;
404-
if (AddressSpace ==
405-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Private)) {
401+
if (AddressSpace == llvm::AMDGPU::Private) {
406402
return DWARF_Private;
407-
} else if (AddressSpace ==
408-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Local)) {
403+
} else if (AddressSpace == llvm::AMDGPU::Local) {
409404
return DWARF_Local;
410405
} else {
411406
return std::nullopt;

‎flang/lib/Frontend/FrontendActions.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
#include "llvm/Passes/PassBuilder.h"
5959
#include "llvm/Passes/PassPlugin.h"
6060
#include "llvm/Passes/StandardInstrumentations.h"
61-
#include "llvm/Support/AMDGPUAddrSpace.h"
6261
#include "llvm/Support/Error.h"
6362
#include "llvm/Support/ErrorHandling.h"
6463
#include "llvm/Support/FileSystem.h"
@@ -303,8 +302,7 @@ static void addAMDGPUSpecificMLIRItems(mlir::ModuleOp &mlirModule,
303302
originalGVOp.setValueAttr(
304303
builder.getIntegerAttr(int32Type, oclcABIVERsion));
305304
originalGVOp.setUnnamedAddr(mlir::LLVM::UnnamedAddr::Local);
306-
originalGVOp.setAddrSpace(
307-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant));
305+
originalGVOp.setAddrSpace(llvm::AMDGPU::Constant);
308306
originalGVOp.setVisibility_(mlir::LLVM::Visibility::Hidden);
309307
return;
310308
}
@@ -315,8 +313,7 @@ static void addAMDGPUSpecificMLIRItems(mlir::ModuleOp &mlirModule,
315313
/* Name */ codeObjectVersionGlobalOpName,
316314
/* Value */ builder.getIntegerAttr(int32Type, oclcABIVERsion));
317315
covInfo.setUnnamedAddr(mlir::LLVM::UnnamedAddr::Local);
318-
covInfo.setAddrSpace(
319-
static_cast<unsigned>(llvm::AMDGPU::AddrSpace::Constant));
316+
covInfo.setAddrSpace(llvm::AMDGPU::Constant);
320317
covInfo.setVisibility_(mlir::LLVM::Visibility::Hidden);
321318
builder.setInsertionPointToStart(mlirModule.getBody());
322319
builder.insert(covInfo);

‎llvm/include/llvm/Support/AMDGPUAddrSpace.h

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

‎llvm/include/llvm/TargetParser/TargetParser.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ class Triple;
3131
// back-end to TableGen to create these clean tables.
3232
namespace AMDGPU {
3333

34+
/// Address space values for AMD GPUs
35+
enum AddrSpace {
36+
Generic = 0,
37+
Global = 1,
38+
Local = 3,
39+
Constant = 4,
40+
Private = 5
41+
};
42+
3443
/// GPU kinds supported by the AMDGPU target.
3544
enum GPUKind : uint32_t {
3645
// Not specified processor.

0 commit comments

Comments
 (0)