Skip to content

Commit b776627

Browse files
seven-mileseven-mile
committed
[CIR][Dialect] Add offload_* cases in address space attribute
1 parent 49941e2 commit b776627

File tree

10 files changed

+121
-21
lines changed

10 files changed

+121
-21
lines changed

‎clang/include/clang/CIR/MissingFeatures.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ struct MissingFeatures {
161161
static bool constantFoldsToSimpleInteger() { return false; }
162162
static bool checkFunctionCallABI() { return false; }
163163
static bool zeroInitializer() { return false; }
164-
static bool targetLoweringInfoAddressSpaceMap() { return false; }
165164
static bool targetCodeGenInfoIsProtoCallVariadic() { return false; }
166165
static bool targetCodeGenInfoGetNullPointer() { return false; }
167166
static bool operandBundles() { return false; }
@@ -277,6 +276,10 @@ struct MissingFeatures {
277276
static bool returnValueDominatingStoreOptmiization() { return false; }
278277
// Globals (vars and functions) may have attributes that are target depedent.
279278
static bool setTargetAttributes() { return false; }
279+
280+
// CIR modules parsed from text form may not carry the triple or data layout
281+
// specs. We should make it always present.
282+
static bool makeTripleAlwaysPresent() { return false; }
280283
};
281284

282285
} // namespace cir

‎clang/lib/CIR/Dialect/IR/CIRAttrs.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -565,10 +565,16 @@ AddressSpaceAttr::getValueFromLangAS(clang::LangAS langAS) {
565565
// Default address space should be encoded as a null attribute.
566566
return std::nullopt;
567567
case LangAS::opencl_global:
568+
return Kind::offload_global;
568569
case LangAS::opencl_local:
570+
return Kind::offload_local;
569571
case LangAS::opencl_constant:
572+
return Kind::offload_constant;
570573
case LangAS::opencl_private:
574+
return Kind::offload_private;
571575
case LangAS::opencl_generic:
576+
return Kind::offload_generic;
577+
572578
case LangAS::opencl_global_device:
573579
case LangAS::opencl_global_host:
574580
case LangAS::cuda_device:

‎clang/lib/CIR/Dialect/Transforms/TargetLowering/TargetLoweringInfo.h

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#include "ABIInfo.h"
1919
#include <memory>
2020

21+
#include "clang/CIR/Dialect/IR/CIRAttrs.h"
22+
2123
namespace mlir {
2224
namespace cir {
2325

@@ -30,6 +32,8 @@ class TargetLoweringInfo {
3032
virtual ~TargetLoweringInfo();
3133

3234
const ABIInfo &getABIInfo() const { return *Info; }
35+
virtual unsigned getTargetAddrSpaceFromCIRAddrSpace(
36+
mlir::cir::AddressSpaceAttr addressSpaceAttr) const = 0;
3337
};
3438

3539
} // namespace cir

‎clang/lib/CIR/Dialect/Transforms/TargetLowering/Targets/AArch64.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,21 @@ class AArch64TargetLoweringInfo : public TargetLoweringInfo {
6262
: TargetLoweringInfo(std::make_unique<AArch64ABIInfo>(LT, Kind)) {
6363
assert(!MissingFeature::swift());
6464
}
65+
66+
unsigned getTargetAddrSpaceFromCIRAddrSpace(
67+
mlir::cir::AddressSpaceAttr addressSpaceAttr) const override {
68+
using Kind = mlir::cir::AddressSpaceAttr::Kind;
69+
switch (addressSpaceAttr.getValue()) {
70+
case Kind::offload_private:
71+
case Kind::offload_local:
72+
case Kind::offload_global:
73+
case Kind::offload_constant:
74+
case Kind::offload_generic:
75+
return 0;
76+
default:
77+
llvm_unreachable("Unknown CIR address space for this target");
78+
}
79+
}
6580
};
6681

6782
} // namespace

‎clang/lib/CIR/Dialect/Transforms/TargetLowering/Targets/SPIR.cpp

+19
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,25 @@ class SPIRVTargetLoweringInfo : public TargetLoweringInfo {
4141
public:
4242
SPIRVTargetLoweringInfo(LowerTypes &LT)
4343
: TargetLoweringInfo(std::make_unique<SPIRVABIInfo>(LT)) {}
44+
45+
unsigned getTargetAddrSpaceFromCIRAddrSpace(
46+
mlir::cir::AddressSpaceAttr addressSpaceAttr) const override {
47+
using Kind = mlir::cir::AddressSpaceAttr::Kind;
48+
switch (addressSpaceAttr.getValue()) {
49+
case Kind::offload_private:
50+
return 0;
51+
case Kind::offload_local:
52+
return 3;
53+
case Kind::offload_global:
54+
return 1;
55+
case Kind::offload_constant:
56+
return 2;
57+
case Kind::offload_generic:
58+
return 4;
59+
default:
60+
llvm_unreachable("Unknown CIR address space for this target");
61+
}
62+
}
4463
};
4564

4665
} // namespace

‎clang/lib/CIR/Dialect/Transforms/TargetLowering/Targets/X86.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,21 @@ class X86_64TargetLoweringInfo : public TargetLoweringInfo {
9292
: TargetLoweringInfo(std::make_unique<X86_64ABIInfo>(LM, AVXLevel)) {
9393
assert(!::cir::MissingFeatures::swift());
9494
}
95+
96+
unsigned getTargetAddrSpaceFromCIRAddrSpace(
97+
mlir::cir::AddressSpaceAttr addressSpaceAttr) const override {
98+
using Kind = mlir::cir::AddressSpaceAttr::Kind;
99+
switch (addressSpaceAttr.getValue()) {
100+
case Kind::offload_private:
101+
case Kind::offload_local:
102+
case Kind::offload_global:
103+
case Kind::offload_constant:
104+
case Kind::offload_generic:
105+
return 0;
106+
default:
107+
llvm_unreachable("Unknown CIR address space for this target");
108+
}
109+
}
95110
};
96111

97112
void X86_64ABIInfo::classify(Type Ty, uint64_t OffsetBase, Class &Lo, Class &Hi,

‎clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

+35-11
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
#include <optional>
7070
#include <set>
7171

72+
#include "LowerModule.h"
73+
7274
using namespace cir;
7375
using namespace llvm;
7476

@@ -3452,28 +3454,48 @@ void populateCIRToLLVMConversionPatterns(mlir::RewritePatternSet &patterns,
34523454
CIRRintOpLowering, CIRRoundOpLowering, CIRSinOpLowering,
34533455
CIRSqrtOpLowering, CIRTruncOpLowering, CIRCopysignOpLowering,
34543456
CIRFModOpLowering, CIRFMaxOpLowering, CIRFMinOpLowering, CIRPowOpLowering,
3455-
CIRClearCacheOpLowering, CIRUndefOpLowering>(converter, patterns.getContext());
3457+
CIRClearCacheOpLowering, CIRUndefOpLowering>(converter,
3458+
patterns.getContext());
34563459
}
34573460

34583461
namespace {
3462+
3463+
std::unique_ptr<mlir::cir::LowerModule>
3464+
prepareLowerModule(mlir::ModuleOp module) {
3465+
mlir::PatternRewriter rewriter{module->getContext()};
3466+
// If the triple is not present, e.g. CIR modules parsed from text, we
3467+
// cannot init LowerModule properly.
3468+
assert(!::cir::MissingFeatures::makeTripleAlwaysPresent());
3469+
if (!module->hasAttr("cir.triple"))
3470+
return {};
3471+
return mlir::cir::createLowerModule(module, rewriter);
3472+
}
3473+
3474+
// FIXME: change the type of lowerModule to `LowerModule &` to have better
3475+
// lambda capturing experience. Also blocked by makeTripleAlwaysPresent.
34593476
void prepareTypeConverter(mlir::LLVMTypeConverter &converter,
3460-
mlir::DataLayout &dataLayout) {
3461-
converter.addConversion([&](mlir::cir::PointerType type) -> mlir::Type {
3477+
mlir::DataLayout &dataLayout,
3478+
mlir::cir::LowerModule *lowerModule) {
3479+
converter.addConversion([&, lowerModule](
3480+
mlir::cir::PointerType type) -> mlir::Type {
34623481
// Drop pointee type since LLVM dialect only allows opaque pointers.
34633482

34643483
auto addrSpace =
34653484
mlir::cast_if_present<mlir::cir::AddressSpaceAttr>(type.getAddrSpace());
3466-
// null addrspace attribute indicates the default addrspace
3485+
// Null addrspace attribute indicates the default addrspace.
34673486
if (!addrSpace)
34683487
return mlir::LLVM::LLVMPointerType::get(type.getContext());
34693488

3470-
// TODO(cir): Query the target-specific address space map to lower other ASs
3471-
// like `opencl_private`.
3472-
assert(!MissingFeatures::targetLoweringInfoAddressSpaceMap());
3473-
assert(addrSpace.isTarget() && "NYI");
3489+
assert(lowerModule && "CIR AS map is not available");
3490+
// Pass through target addrspace and map CIR addrspace to LLVM addrspace by
3491+
// querying the target info.
3492+
unsigned targetAS =
3493+
addrSpace.isTarget()
3494+
? addrSpace.getTargetValue()
3495+
: lowerModule->getTargetLoweringInfo()
3496+
.getTargetAddrSpaceFromCIRAddrSpace(addrSpace);
34743497

3475-
return mlir::LLVM::LLVMPointerType::get(type.getContext(),
3476-
addrSpace.getTargetValue());
3498+
return mlir::LLVM::LLVMPointerType::get(type.getContext(), targetAS);
34773499
});
34783500
converter.addConversion([&](mlir::cir::DataMemberType type) -> mlir::Type {
34793501
return mlir::IntegerType::get(type.getContext(),
@@ -3698,7 +3720,9 @@ void ConvertCIRToLLVMPass::runOnOperation() {
36983720
auto module = getOperation();
36993721
mlir::DataLayout dataLayout(module);
37003722
mlir::LLVMTypeConverter converter(&getContext());
3701-
prepareTypeConverter(converter, dataLayout);
3723+
std::unique_ptr<mlir::cir::LowerModule> lowerModule =
3724+
prepareLowerModule(module);
3725+
prepareTypeConverter(converter, dataLayout, lowerModule.get());
37023726

37033727
mlir::RewritePatternSet patterns(&getContext());
37043728

‎clang/test/CIR/CodeGen/OpenCL/addrspace-alloca.cl

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,23 @@
33
// RUN: %clang_cc1 -cl-std=CL3.0 -O0 -fclangir -emit-llvm -triple spirv64-unknown-unknown %s -o %t.ll
44
// RUN: FileCheck --input-file=%t.ll %s --check-prefix=LLVM
55

6-
// Lowering of language-specific AS not supported
7-
// XFAIL: *
86

9-
// CIR: cir.func @func(%arg0: !cir.ptr<!s32i, addrspace(target<3>)>
7+
// CIR: cir.func @func(%arg0: !cir.ptr<!s32i, addrspace(offload_local)>
108
// LLVM: @func(ptr addrspace(3)
119
kernel void func(local int *p) {
12-
// CIR-NEXT: %[[#ALLOCA_P:]] = cir.alloca !cir.ptr<!s32i, addrspace(target<3>)>, !cir.ptr<!cir.ptr<!s32i, addrspace(target<3>)>>, ["p", init] {alignment = 8 : i64}
10+
// CIR-NEXT: %[[#ALLOCA_P:]] = cir.alloca !cir.ptr<!s32i, addrspace(offload_local)>, !cir.ptr<!cir.ptr<!s32i, addrspace(offload_local)>>, ["p", init] {alignment = 8 : i64}
1311
// LLVM-NEXT: %[[#ALLOCA_P:]] = alloca ptr addrspace(3), i64 1, align 8
1412

1513
int x;
1614
// CIR-NEXT: %[[#ALLOCA_X:]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["x"] {alignment = 4 : i64}
1715
// LLVM-NEXT: %[[#ALLOCA_X:]] = alloca i32, i64 1, align 4
1816

1917
global char *b;
20-
// CIR-NEXT: %[[#ALLOCA_B:]] = cir.alloca !cir.ptr<!s8i, addrspace(target<1>)>, !cir.ptr<!cir.ptr<!s8i, addrspace(target<1>)>>, ["b"] {alignment = 8 : i64}
18+
// CIR-NEXT: %[[#ALLOCA_B:]] = cir.alloca !cir.ptr<!s8i, addrspace(offload_global)>, !cir.ptr<!cir.ptr<!s8i, addrspace(offload_global)>>, ["b"] {alignment = 8 : i64}
2119
// LLVM-NEXT: %[[#ALLOCA_B:]] = alloca ptr addrspace(1), i64 1, align 8
2220

2321
// Store of the argument `p`
24-
// CIR-NEXT: cir.store %arg0, %[[#ALLOCA_P]] : !cir.ptr<!s32i, addrspace(target<3>)>, !cir.ptr<!cir.ptr<!s32i, addrspace(target<3>)>>
22+
// CIR-NEXT: cir.store %arg0, %[[#ALLOCA_P]] : !cir.ptr<!s32i, addrspace(offload_local)>, !cir.ptr<!cir.ptr<!s32i, addrspace(offload_local)>>
2523
// LLVM-NEXT: store ptr addrspace(3) %{{[0-9]+}}, ptr %[[#ALLOCA_P]], align 8
2624

2725
return;

‎clang/test/CIR/CodeGen/OpenCL/spirv-target.cl

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// RUN: %clang_cc1 -cl-std=CL3.0 -fclangir -emit-llvm -triple spirv64-unknown-unknown %s -o %t_64.ll
55
// RUN: FileCheck --input-file=%t_64.ll %s --check-prefix=LLVM-SPIRV64
66

7-
// Lowering of language-specific AS not supported
8-
// XFAIL: *
97

108
// CIR-SPIRV64: cir.triple = "spirv64-unknown-unknown"
119
// LLVM-SPIRV64: target triple = "spirv64-unknown-unknown"

‎clang/test/CIR/Lowering/address-space.cir

+19-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
!s32i = !cir.int<s, 32>
55

6-
module {
6+
module attributes {
7+
cir.triple = "spirv64-unknown-unknown",
8+
llvm.data_layout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
9+
} {
710
// LLVM: define void @foo(ptr %0)
811
cir.func @foo(%arg0: !cir.ptr<!s32i>) {
912
// LLVM-NEXT: alloca ptr,
@@ -24,4 +27,19 @@ module {
2427
%0 = cir.alloca !cir.ptr<!s32i, addrspace(target<0>)>, !cir.ptr<!cir.ptr<!s32i, addrspace(target<0>)>>, ["arg", init] {alignment = 8 : i64}
2528
cir.return
2629
}
30+
31+
// LLVM: define void @test_lower_offload_as()
32+
cir.func @test_lower_offload_as() {
33+
%0 = cir.alloca !cir.ptr<!s32i, addrspace(offload_private)>, !cir.ptr<!cir.ptr<!s32i, addrspace(offload_private)>>, ["arg0", init] {alignment = 8 : i64}
34+
// LLVM-NEXT: alloca ptr,
35+
%1 = cir.alloca !cir.ptr<!s32i, addrspace(offload_global)>, !cir.ptr<!cir.ptr<!s32i, addrspace(offload_global)>>, ["arg1", init] {alignment = 8 : i64}
36+
// LLVM-NEXT: alloca ptr addrspace(1),
37+
%2 = cir.alloca !cir.ptr<!s32i, addrspace(offload_constant)>, !cir.ptr<!cir.ptr<!s32i, addrspace(offload_constant)>>, ["arg2", init] {alignment = 8 : i64}
38+
// LLVM-NEXT: alloca ptr addrspace(2),
39+
%3 = cir.alloca !cir.ptr<!s32i, addrspace(offload_local)>, !cir.ptr<!cir.ptr<!s32i, addrspace(offload_local)>>, ["arg3", init] {alignment = 8 : i64}
40+
// LLVM-NEXT: alloca ptr addrspace(3),
41+
%4 = cir.alloca !cir.ptr<!s32i, addrspace(offload_generic)>, !cir.ptr<!cir.ptr<!s32i, addrspace(offload_generic)>>, ["arg4", init] {alignment = 8 : i64}
42+
// LLVM-NEXT: alloca ptr addrspace(4),
43+
cir.return
44+
}
2745
}

0 commit comments

Comments
 (0)