[CIR] Add GEP flags to ptr stride op #1863
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2835,10 +2835,16 @@ mlir::Value CIRGenFunction::emitCheckedInBoundsGEP( | |
| assert(IdxList.size() == 1 && "multi-index ptr arithmetic NYI"); | ||
| mlir::Value GEPVal = | ||
| builder.create<cir::PtrStrideOp>(CGM.getLoc(Loc), PtrTy, Ptr, IdxList[0]); | ||
| // If the pointer overflow sanitizer isn't enabled, do nothing. | ||
| if (!SanOpts.has(SanitizerKind::PointerOverflow)) { | ||
| cir::CIR_GEPNoWrapFlags nwFlags = cir::CIR_GEPNoWrapFlags::inbounds; | ||
| if (!SignedIndices && !IsSubtraction) | ||
| nwFlags = nwFlags | cir::CIR_GEPNoWrapFlags::nuw; | ||
| return builder.create<cir::PtrStrideOp>(CGM.getLoc(Loc), PtrTy, Ptr, | ||
| IdxList[0], nwFlags); | ||
| } | ||
|
|
||
| return GEPVal; | ||
|
|
||
| // TODO(cir): the unreachable code below hides a substantial amount of code | ||
| // from the original codegen related with pointer overflow sanitizer. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ | |
| #include "clang/CIR/Dialect/IR/CIRTypes.h" | ||
| #include "clang/CIR/Interfaces/CIRLoopOpInterface.h" | ||
| #include "clang/CIR/MissingFeatures.h" | ||
| #include "llvm/ADT/StringExtras.h" | ||
badumbatish marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| #include "llvm/ADT/TypeSwitch.h" | ||
| #include "llvm/Support/ErrorHandling.h" | ||
| #include "llvm/Support/LogicalResult.h" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,6 +92,25 @@ void walkRegionSkipping(mlir::Region ®ion, | |
| }); | ||
| } | ||
|
|
||
| /// Convert from a CIR PtrStrideOp kind to an LLVM IR equivalent of GEP. | ||
| mlir::LLVM::GEPNoWrapFlags | ||
| convertPtrStrideKindToGEPFlags(cir::CIR_GEPNoWrapFlags flags) { | ||
| static std::unordered_map<cir::CIR_GEPNoWrapFlags, mlir::LLVM::GEPNoWrapFlags> | ||
| mp = { | ||
| {cir::CIR_GEPNoWrapFlags::none, mlir::LLVM::GEPNoWrapFlags::none}, | ||
| {cir::CIR_GEPNoWrapFlags::inbounds, | ||
| mlir::LLVM::GEPNoWrapFlags::inbounds}, | ||
| {cir::CIR_GEPNoWrapFlags::inboundsFlag, | ||
| mlir::LLVM::GEPNoWrapFlags::inboundsFlag}, | ||
| {cir::CIR_GEPNoWrapFlags::nusw, mlir::LLVM::GEPNoWrapFlags::nusw}, | ||
| {cir::CIR_GEPNoWrapFlags::nuw, mlir::LLVM::GEPNoWrapFlags::nuw}, | ||
| }; | ||
| mlir::LLVM::GEPNoWrapFlags x = mlir::LLVM::GEPNoWrapFlags::none; | ||
| for (auto [key, _] : mp) | ||
| x = x | mp.at(flags & key); | ||
| return x; | ||
|
Comment on lines
+98
to
+111
There was a problem hiding this comment. Don't use a This should just be a series of |
||
| } | ||
|
|
||
| /// Convert from a CIR comparison kind to an LLVM IR integral comparison kind. | ||
| mlir::LLVM::ICmpPredicate convertCmpKindToICmpPredicate(cir::CmpOpKind kind, | ||
| bool isSigned) { | ||
|
|
@@ -1023,9 +1042,9 @@ mlir::LogicalResult CIRToLLVMPtrStrideOpLowering::matchAndRewrite( | |
| isUnsigned = strideTy.isUnsigned(); | ||
| index = promoteIndex(rewriter, index, *layoutWidth, isUnsigned); | ||
| } | ||
| rewriter.replaceOpWithNewOp<mlir::LLVM::GEPOp>( | ||
| ptrStrideOp, resultTy, elementTy, adaptor.getBase(), index, | ||
| convertPtrStrideKindToGEPFlags(adaptor.getNoWrapFlags())); | ||
| return mlir::success(); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,14 +36,14 @@ void *f4(void *a, int b) { return a - b; } | |
| // CIR: %[[PTR:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void> | ||
| // CIR: %[[STRIDE:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!s32i>, !s32i | ||
| // CIR: %[[SUB:.*]] = cir.unary(minus, %[[STRIDE]]) : !s32i, !s32i | ||
| // CIR: cir.ptr_stride(%[[PTR]] : !cir.ptr<!void>, %[[SUB]] : !s32i, inbounds) | ||
|
|
||
| // LLVM-LABEL: f4 | ||
| // LLVM: %[[PTR:.*]] = load ptr, ptr {{.*}}, align 8 | ||
| // LLVM: %[[TOEXT:.*]] = load i32, ptr {{.*}}, align 4 | ||
| // LLVM: %[[STRIDE:.*]] = sext i32 %[[TOEXT]] to i64 | ||
| // LLVM: %[[SUB:.*]] = sub i64 0, %[[STRIDE]] | ||
| // LLVM: getelementptr inbounds i8, ptr %[[PTR]], i64 %[[SUB]] | ||
|
|
||
| // Similar to f4, just make sure it does not crash. | ||
| void *f4_1(void *a, int b) { return (a -= b); } | ||
|
|
@@ -52,13 +52,13 @@ FP f5(FP a, int b) { return a + b; } | |
| // CIR-LABEL: f5 | ||
| // CIR: %[[PTR:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!cir.ptr<!cir.func<()>>>, !cir.ptr<!cir.func<()>> | ||
| // CIR: %[[STRIDE:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!s32i>, !s32i | ||
| // CIR: cir.ptr_stride(%[[PTR]] : !cir.ptr<!cir.func<()>>, %[[STRIDE]] : !s32i, inbounds) | ||
|
|
||
| // LLVM-LABEL: f5 | ||
| // LLVM: %[[PTR:.*]] = load ptr, ptr {{.*}}, align 8 | ||
| // LLVM: %[[TOEXT:.*]] = load i32, ptr {{.*}}, align 4 | ||
| // LLVM: %[[STRIDE:.*]] = sext i32 %[[TOEXT]] to i64 | ||
| // LLVM: getelementptr inbounds i8, ptr %[[PTR]], i64 %[[STRIDE]] | ||
|
|
||
| // These test the same paths above, just make sure it does not crash. | ||
| FP f5_1(FP a, int b) { return (a += b); } | ||
|
|
@@ -70,14 +70,14 @@ FP f7(FP a, int b) { return a - b; } | |
| // CIR: %[[PTR:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!cir.ptr<!cir.func<()>>>, !cir.ptr<!cir.func<()>> | ||
| // CIR: %[[STRIDE:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!s32i>, !s32i | ||
| // CIR: %[[SUB:.*]] = cir.unary(minus, %[[STRIDE]]) : !s32i, !s32i | ||
| // CIR: cir.ptr_stride(%[[PTR]] : !cir.ptr<!cir.func<()>>, %[[SUB]] : !s32i, inbounds) | ||
|
|
||
| // LLVM-LABEL: f7 | ||
| // LLVM: %[[PTR:.*]] = load ptr, ptr {{.*}}, align 8 | ||
| // LLVM: %[[TOEXT:.*]] = load i32, ptr {{.*}}, align 4 | ||
| // LLVM: %[[STRIDE:.*]] = sext i32 %[[TOEXT]] to i64 | ||
| // LLVM: %[[SUB:.*]] = sub i64 0, %[[STRIDE]] | ||
| // LLVM: getelementptr inbounds i8, ptr %[[PTR]], i64 %[[SUB]] | ||
|
|
||
| // Similar to f7, just make sure it does not crash. | ||
| FP f7_1(FP a, int b) { return (a -= b); } | ||
|
|
@@ -87,14 +87,14 @@ void f8(void *a, int b) { return *(id(a + b)); } | |
| // CIR-LABEL: f8 | ||
| // CIR: %[[PTR:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void> | ||
| // CIR: %[[STRIDE:.*]] = cir.load{{.*}} {{.*}} : !cir.ptr<!s32i>, !s32i | ||
| // CIR: cir.ptr_stride(%[[PTR]] : !cir.ptr<!void>, %[[STRIDE]] : !s32i, inbounds) | ||
| // CIR: cir.return | ||
|
|
||
| // LLVM-LABEL: f8 | ||
| // LLVM: %[[PTR:.*]] = load ptr, ptr {{.*}}, align 8 | ||
| // LLVM: %[[TOEXT:.*]] = load i32, ptr {{.*}}, align 4 | ||
| // LLVM: %[[STRIDE:.*]] = sext i32 %[[TOEXT]] to i64 | ||
| // LLVM: getelementptr inbounds i8, ptr %[[PTR]], i64 %[[STRIDE]] | ||
| // LLVM: ret void | ||
|
|
||
| void f8_1(void *a, int b) { return a[b]; } | ||
|
|
@@ -119,7 +119,8 @@ unsigned char *p(unsigned int x) { | |
|
|
||
| // CIR-LABEL: @p | ||
| // CIR: %[[SUB:.*]] = cir.binop(sub | ||
| // CIR: cir.ptr_stride({{.*}} : !cir.ptr<!u8i>, %[[SUB]] : !u32i, inbounds|nuw), !cir.ptr<!u8i> | ||
|
|
||
| // LLVM-LABEL: @p | ||
| // LLVM: getelementptr inbounds nuw i8, ptr {{.*}} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,64 @@ | ||
| // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-cir %s -o %t.cir | ||
| // RUN: FileCheck --input-file=%t.cir %s --check-prefix=CIR | ||
| // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=LLVM | ||
| // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=OGCG | ||
|
|
||
| // Should generate basic pointer arithmetics. | ||
| void foo(int *iptr, char *cptr, unsigned ustride) { | ||
| *(iptr + 2) = 1; | ||
| // CIR: %[[#STRIDE:]] = cir.const #cir.int<2> : !s32i | ||
| // CIR: cir.ptr_stride(%{{.+}} : !cir.ptr<!s32i>, %[[#STRIDE]] : !s32i, inbounds), !cir.ptr<!s32i> | ||
| // LLVM: getelementptr inbounds | ||
| // OGCG: getelementptr inbounds | ||
| *(cptr + 3) = 1; | ||
| // CIR: %[[#STRIDE:]] = cir.const #cir.int<3> : !s32i | ||
| // CIR: cir.ptr_stride(%{{.+}} : !cir.ptr<!s8i>, %[[#STRIDE]] : !s32i, inbounds), !cir.ptr<!s8i> | ||
| // LLVM: getelementptr inbounds | ||
| // OGCG: getelementptr inbounds | ||
| *(iptr - 2) = 1; | ||
| // CIR: %[[#STRIDE:]] = cir.const #cir.int<2> : !s32i | ||
| // CIR: %[[#NEGSTRIDE:]] = cir.unary(minus, %[[#STRIDE]]) : !s32i, !s32i | ||
| // CIR: cir.ptr_stride(%{{.+}} : !cir.ptr<!s32i>, %[[#NEGSTRIDE]] : !s32i, inbounds), !cir.ptr<!s32i> | ||
| // LLVM: getelementptr inbounds | ||
| // OGCG: getelementptr inbounds | ||
| *(cptr - 3) = 1; | ||
| // CIR: %[[#STRIDE:]] = cir.const #cir.int<3> : !s32i | ||
| // CIR: %[[#NEGSTRIDE:]] = cir.unary(minus, %[[#STRIDE]]) : !s32i, !s32i | ||
| // CIR: cir.ptr_stride(%{{.+}} : !cir.ptr<!s8i>, %[[#NEGSTRIDE]] : !s32i, inbounds), !cir.ptr<!s8i> | ||
| // LLVM: getelementptr inbounds | ||
| // OGCG: getelementptr inbounds | ||
| *(iptr + ustride) = 1; | ||
| // CIR: %[[#STRIDE:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!u32i>, !u32i | ||
| // CIR: cir.ptr_stride(%{{.+}} : !cir.ptr<!s32i>, %[[#STRIDE]] : !u32i, inbounds|nuw), !cir.ptr<!s32i> | ||
|
|
||
| // LLVM: getelementptr inbounds nuw | ||
| // OGCG: getelementptr inbounds nuw | ||
|
|
||
| // Must convert unsigned stride to a signed one. | ||
| *(iptr - ustride) = 1; | ||
| // CIR: %[[#STRIDE:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!u32i>, !u32i | ||
| // CIR: %[[#SIGNSTRIDE:]] = cir.cast(integral, %[[#STRIDE]] : !u32i), !s32i | ||
| // CIR: %[[#NEGSTRIDE:]] = cir.unary(minus, %[[#SIGNSTRIDE]]) : !s32i, !s32i | ||
| // CIR: cir.ptr_stride(%{{.+}} : !cir.ptr<!s32i>, %[[#NEGSTRIDE]] : !s32i, inbounds), !cir.ptr<!s32i> | ||
| // LLVM: getelementptr inbounds | ||
| // OGCG: getelementptr inbounds | ||
| } | ||
|
|
||
| void testPointerSubscriptAccess(int *ptr) { | ||
| // CIR: testPointerSubscriptAccess | ||
| ptr[1] = 2; | ||
| // CIR: %[[#V1:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!cir.ptr<!s32i>>, !cir.ptr<!s32i> | ||
| // CIR: %[[#V2:]] = cir.const #cir.int<1> : !s32i | ||
| // CIR: cir.ptr_stride(%[[#V1]] : !cir.ptr<!s32i>, %[[#V2]] : !s32i), !cir.ptr<!s32i> | ||
| } | ||
|
|
||
| void testPointerMultiDimSubscriptAccess(int **ptr) { | ||
| // CIR: testPointerMultiDimSubscriptAccess | ||
| ptr[1][2] = 3; | ||
| // CIR: %[[#V1:]] = cir.load{{.*}} %{{.+}} : !cir.ptr<!cir.ptr<!cir.ptr<!s32i>>>, !cir.ptr<!cir.ptr<!s32i>> | ||
| // CIR: %[[#V2:]] = cir.const #cir.int<1> : !s32i | ||
| // CIR: %[[#V3:]] = cir.ptr_stride(%[[#V1]] : !cir.ptr<!cir.ptr<!s32i>>, %[[#V2]] : !s32i), !cir.ptr<!cir.ptr<!s32i>> | ||
| // CIR: %[[#V4:]] = cir.load{{.*}} %[[#V3]] : !cir.ptr<!cir.ptr<!s32i>>, !cir.ptr<!s32i> | ||
| // CIR: %[[#V5:]] = cir.const #cir.int<2> : !s32i | ||
| // CIR: cir.ptr_stride(%[[#V4]] : !cir.ptr<!s32i>, %[[#V5]] : !s32i), !cir.ptr<!s32i> | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,14 @@ module { | |
| %4 = cir.ptr_stride(%2 : !cir.ptr<!s32i>, %3 : !s32i), !cir.ptr<!s32i> | ||
| cir.return | ||
| } | ||
|
|
||
| cir.func @gepflags(%arg0: !cir.ptr<!s32i>, %arg1: !s32i) { | ||
| %0 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i), !cir.ptr<!s32i> | ||
| %1 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i, nuw), !cir.ptr<!s32i> | ||
| %2 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i, inbounds|nuw), !cir.ptr<!s32i> | ||
| %3 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i, none), !cir.ptr<!s32i> | ||
| cir.return | ||
| } | ||
| } | ||
|
|
||
| // CHECK: cir.func @arraysubscript(%arg0: !s32i) { | ||
|
|
@@ -20,3 +28,12 @@ module { | |
| // CHECK-NEXT: %4 = cir.ptr_stride(%2 : !cir.ptr<!s32i>, %3 : !s32i), !cir.ptr<!s32i> | ||
| // CHECK-NEXT: cir.return | ||
| // CHECK-NEXT: } | ||
|
|
||
|
|
||
| // CHECK: cir.func @gepflags(%arg0: !cir.ptr<!s32i>, %arg1: !s32i) { | ||
| // CHECK-NEXT: %0 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i), !cir.ptr<!s32i> | ||
| // CHECK-NEXT: %1 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i, nuw), !cir.ptr<!s32i> | ||
| // CHECK-NEXT: %2 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i, inbounds|nuw), !cir.ptr<!s32i> | ||
| // CHECK-NEXT: %3 = cir.ptr_stride(%arg0 : !cir.ptr<!s32i>, %arg1 : !s32i), !cir.ptr<!s32i> | ||
| // CHECK-NEXT: cir.return | ||
| // CHECK-NEXT: } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking at other dialects, I think this should be: