Skip to content

Commit 115c9f7

Browse files
RiverDaveRiverDave
committed
Fix formatting
1 parent 860ac4d commit 115c9f7

File tree

4 files changed

+15
-23
lines changed

4 files changed

+15
-23
lines changed

‎clang/lib/CIR/CodeGen/CIRGenExprScalar.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "llvm/Support/ErrorHandling.h"
2929
#include <cstdint>
3030

31+
#include "mlir/Dialect/Ptr/IR/MemorySpaceInterfaces.h"
3132
#include "mlir/IR/Attributes.h"
3233
#include "mlir/IR/BuiltinTypes.h"
3334
#include "mlir/IR/Value.h"
@@ -1607,8 +1608,8 @@ mlir::Value ScalarExprEmitter::emitSub(const BinOpInfo &Ops) {
16071608
cir::PointerType rhsPtrTy = mlir::dyn_cast<cir::PointerType>(rhs.getType());
16081609

16091610
if (lhsPtrTy && rhsPtrTy) {
1610-
cir::AddressSpace lhsAS = lhsPtrTy.getAddrSpace();
1611-
cir::AddressSpace rhsAS = rhsPtrTy.getAddrSpace();
1611+
mlir::ptr::MemorySpaceAttrInterface lhsAS = lhsPtrTy.getAddrSpace();
1612+
mlir::ptr::MemorySpaceAttrInterface rhsAS = rhsPtrTy.getAddrSpace();
16121613

16131614
if (lhsAS != rhsAS) {
16141615
// Different address spaces → use addrspacecast

‎clang/test/CIR/CodeGen/HIP/ptr-diff.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ __device__ int ptr_diff() {
2323

2424

2525
// CIR-DEVICE: %[[#LenLocalAddr:]] = cir.alloca !cir.ptr<!s8i>, !cir.ptr<!cir.ptr<!s8i>>, ["len", init]
26-
// CIR-DEVICE: %[[#GlobalPtr:]] = cir.get_global @_ZZ8ptr_diffvE5c_str : !cir.ptr<!cir.array<!s8i x 9>, addrspace(offload_constant)>
27-
// CIR-DEVICE: %[[#CastDecay:]] = cir.cast array_to_ptrdecay %[[#GlobalPtr]] : !cir.ptr<!cir.array<!s8i x 9>, addrspace(offload_constant)>
28-
// CIR-DEVICE: %[[#LenLocalAddrCast:]] = cir.cast bitcast %[[#LenLocalAddr]] : !cir.ptr<!cir.ptr<!s8i>> -> !cir.ptr<!cir.ptr<!s8i, addrspace(offload_constant)>>
29-
// CIR-DEVICE: cir.store align(8) %[[#CastDecay]], %[[#LenLocalAddrCast]] : !cir.ptr<!s8i, addrspace(offload_constant)>, !cir.ptr<!cir.ptr<!s8i, addrspace(offload_constant)>>
30-
// CIR-DEVICE: %[[#CStr:]] = cir.cast array_to_ptrdecay %[[#GlobalPtr]] : !cir.ptr<!cir.array<!s8i x 9>, addrspace(offload_constant)> -> !cir.ptr<!s8i, addrspace(offload_constant)>
26+
// CIR-DEVICE: %[[#GlobalPtr:]] = cir.get_global @_ZZ8ptr_diffvE5c_str : !cir.ptr<!cir.array<!s8i x 9>, lang_address_space(offload_constant)>
27+
// CIR-DEVICE: %[[#CastDecay:]] = cir.cast array_to_ptrdecay %[[#GlobalPtr]] : !cir.ptr<!cir.array<!s8i x 9>, lang_address_space(offload_constant)>
28+
// CIR-DEVICE: %[[#LenLocalAddrCast:]] = cir.cast bitcast %[[#LenLocalAddr]] : !cir.ptr<!cir.ptr<!s8i>> -> !cir.ptr<!cir.ptr<!s8i, lang_address_space(offload_constant)>>
29+
// CIR-DEVICE: cir.store align(8) %[[#CastDecay]], %[[#LenLocalAddrCast]] : !cir.ptr<!s8i, lang_address_space(offload_constant)>, !cir.ptr<!cir.ptr<!s8i, lang_address_space(offload_constant)>>
30+
// CIR-DEVICE: %[[#CStr:]] = cir.cast array_to_ptrdecay %[[#GlobalPtr]] : !cir.ptr<!cir.array<!s8i x 9>, lang_address_space(offload_constant)> -> !cir.ptr<!s8i, lang_address_space(offload_constant)>
3131
// CIR-DEVICE: %[[#LoadedLenAddr:]] = cir.load align(8) %[[#LenLocalAddr]] : !cir.ptr<!cir.ptr<!s8i>>, !cir.ptr<!s8i> loc(#loc7)
32-
// CIR-DEVICE: %[[#AddrCast:]] = cir.cast address_space %[[#LoadedLenAddr]] : !cir.ptr<!s8i> -> !cir.ptr<!s8i, addrspace(offload_constant)>
33-
// CIR-DEVICE: %[[#DIFF:]] = cir.ptr_diff %[[#CStr]], %[[#AddrCast]] : !cir.ptr<!s8i, addrspace(offload_constant)>
32+
// CIR-DEVICE: %[[#AddrCast:]] = cir.cast address_space %[[#LoadedLenAddr]] : !cir.ptr<!s8i> -> !cir.ptr<!s8i, lang_address_space(offload_constant)>
33+
// CIR-DEVICE: %[[#DIFF:]] = cir.ptr_diff %[[#CStr]], %[[#AddrCast]] : !cir.ptr<!s8i, lang_address_space(offload_constant)>
3434

3535
// LLVM-DEVICE: define dso_local i32 @_Z8ptr_diffv()
3636
// LLVM-DEVICE: %[[#GlobalPtrAddr:]] = alloca i32, i64 1, align 4, addrspace(5)

‎clang/test/CIR/CodeGen/OpenCL/as_type.cl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
typedef __attribute__(( ext_vector_type(4) )) char char4;
1111

1212
// CIR: cir.func @f4(%{{.*}}: !s32i loc({{.*}})) -> !cir.vector<!s8i x 4>
13-
// CIR: %[[x:.*]] = cir.load align(4) %{{.*}} : !cir.ptr<!s32i, addrspace(offload_private)>
13+
// CIR: %[[x:.*]] = cir.load align(4) %{{.*}} : !cir.ptr<!s32i, lang_address_space(offload_private)>
1414
// CIR: cir.cast bitcast %[[x]] : !s32i -> !cir.vector<!s8i x 4>
1515
// LLVM: define spir_func <4 x i8> @f4(i32 %[[x:.*]])
1616
// LLVM: %[[astype:.*]] = bitcast i32 %[[x]] to <4 x i8>
@@ -25,7 +25,7 @@ char4 f4(int x) {
2525
}
2626

2727
// CIR: cir.func @f6(%{{.*}}: !cir.vector<!s8i x 4> loc({{.*}})) -> !s32i
28-
// CIR: %[[x:.*]] = cir.load align(4) %{{.*}} : !cir.ptr<!cir.vector<!s8i x 4>, addrspace(offload_private)>, !cir.vector<!s8i x 4>
28+
// CIR: %[[x:.*]] = cir.load align(4) %{{.*}} : !cir.ptr<!cir.vector<!s8i x 4>, lang_address_space(offload_private)>, !cir.vector<!s8i x 4>
2929
// CIR: cir.cast bitcast %[[x]] : !cir.vector<!s8i x 4> -> !s32i
3030
// LLVM: define{{.*}} spir_func i32 @f6(<4 x i8> %[[x:.*]])
3131
// LLVM: %[[astype:.*]] = bitcast <4 x i8> %[[x]] to i32
@@ -39,9 +39,9 @@ int f6(char4 x) {
3939
return __builtin_astype(x, int);
4040
}
4141

42-
// CIR: cir.func @f4_ptr(%{{.*}}: !cir.ptr<!s32i, addrspace(offload_global)> loc({{.*}})) -> !cir.ptr<!cir.vector<!s8i x 4>, addrspace(offload_local)>
43-
// CIR: %[[x:.*]] = cir.load align(8) %{{.*}} : !cir.ptr<!cir.ptr<!s32i, addrspace(offload_global)>, addrspace(offload_private)>, !cir.ptr<!s32i, addrspace(offload_global)>
44-
// CIR: cir.cast address_space %[[x]] : !cir.ptr<!s32i, addrspace(offload_global)> -> !cir.ptr<!cir.vector<!s8i x 4>, addrspace(offload_local)>
42+
// CIR: cir.func @f4_ptr(%{{.*}}: !cir.ptr<!s32i, lang_address_space(offload_global)> loc({{.*}})) -> !cir.ptr<!cir.vector<!s8i x 4>, lang_address_space(offload_local)>
43+
// CIR: %[[x:.*]] = cir.load align(8) %{{.*}} : !cir.ptr<!cir.ptr<!s32i, lang_address_space(offload_global)>, lang_address_space(offload_private)>, !cir.ptr<!s32i, lang_address_space(offload_global)>
44+
// CIR: cir.cast address_space %[[x]] : !cir.ptr<!s32i, lang_address_space(offload_global)> -> !cir.ptr<!cir.vector<!s8i x 4>, lang_address_space(offload_local)>
4545
// LLVM: define spir_func ptr addrspace(3) @f4_ptr(ptr addrspace(1) readnone captures(ret: address, provenance) %[[x:.*]])
4646
// LLVM: %[[astype:.*]] = addrspacecast ptr addrspace(1) %[[x]] to ptr addrspace(3)
4747
// LLVM-NOT: shufflevector

‎clang/test/CIR/IR/invalid.cir‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,6 @@ cir.func @cast24(%p : !u32i) {
300300

301301
// -----
302302

303-
!u32i = !cir.int<u, 32>
304-
!u64i = !cir.int<u, 64>
305-
cir.func @cast25(%p : !cir.ptr<!u32i, target_address_space(1)>) {
306-
%0 = cir.cast address_space %p : !cir.ptr<!u32i, target_address_space(1)> -> !cir.ptr<!u64i, target_address_space(2)> // expected-error {{requires two types differ in addrspace only}}
307-
cir.return
308-
}
309-
310-
// -----
311-
312303
!u64i = !cir.int<u, 64>
313304
cir.func @cast26(%p : !cir.ptr<!u64i, target_address_space(1)>) {
314305
%0 = cir.cast address_space %p : !cir.ptr<!u64i, target_address_space(1)> -> !u64i // expected-error {{requires !cir.ptr type for source and result}}

0 commit comments

Comments
 (0)