Skip to content

[Passes] Run ConstraintElimination after loop optimizations. #10108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

[Passes] Run ConstraintElimination after loop optimizations. #10108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 14 additions & 37 deletions clang/test/BoundsSafety/CodeGen/opt-remarks/bounds-safety-missed-binop-overflow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: Function: test_shl
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Annotated '
// OPT-REM-NEXT: - count: '2'
// OPT-REM-NEXT: - count: '3'
// OPT-REM-NEXT: - String: ' instructions with '
// OPT-REM-NEXT: - type: bounds-safety-missed-optimization-nuw
// OPT-REM-NEXT: ...
Expand Down Expand Up @@ -229,23 +229,26 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: Function: test_shl
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Inserted '
// OPT-REM-NEXT: - count: '4'
// OPT-REM-NEXT: - count: '5'
// OPT-REM-NEXT: - String: ' LLVM IR instruction'
// OPT-REM-NEXT: - String: s
// OPT-REM-NEXT: - String: "\n"
// OPT-REM-NEXT: - String: "used for:\n"
// OPT-REM-NEXT: - String: bounds-safety-check-ptr-lt-upper-bound, bounds-safety-check-ptr-ge-lower-bound
// OPT-REM-NEXT: - String: bounds-safety-missed-optimization-nuw, bounds-safety-check-ptr-lt-upper-bound, bounds-safety-check-ptr-ge-lower-bound
// OPT-REM-NEXT: - String: |
// OPT-REM-NEXT: {{^[ ]+$}}
// OPT-REM-NEXT: {{^[ ]+$}}
// OPT-REM-NEXT: instructions:
// OPT-REM-EMPTY:
// OPT-REM-NEXT: - String: |
// OPT-REM-NEXT: other (LLVM IR 'shl')
// OPT-REM-NEXT: cmp ult (LLVM IR 'icmp')
// OPT-REM-NEXT: cmp uge (LLVM IR 'icmp')
// OPT-REM-NEXT: and (LLVM IR 'and')
// OPT-REM-NEXT: cond branch (LLVM IR 'br')
// OPT-REM-EMPTY:
// OPT-REM-NEXT: - String: "Missed Optimization Info\n"
// OPT-REM-NEXT: - String: Check can not be removed because the arithmetic operation might wrap in the unsigned sense. Optimize the check by adding conditions to check for overflow before doing the operation
// OPT-REM-NEXT: ...

// OPT-REM-NEXT: --- !Analysis
Expand All @@ -269,7 +272,7 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: Function: test_mul
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Annotated '
// OPT-REM-NEXT: - count: '2'
// OPT-REM-NEXT: - count: '3'
// OPT-REM-NEXT: - String: ' instructions with '
// OPT-REM-NEXT: - type: bounds-safety-missed-optimization-nuw
// OPT-REM-NEXT: ...
Expand Down Expand Up @@ -440,24 +443,25 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: Function: test_mul
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Inserted '
// OPT-REM-NEXT: - count: '4'
// OPT-REM-NEXT: - count: '5'
// OPT-REM-NEXT: - String: ' LLVM IR instruction'
// OPT-REM-NEXT: - String: s
// OPT-REM-NEXT: - String: "\n"
// OPT-REM-NEXT: - String: "used for:\n"
// OPT-REM-NEXT: - String: bounds-safety-check-ptr-lt-upper-bound, bounds-safety-check-ptr-ge-lower-bound
// OPT-REM-NEXT: - String: bounds-safety-missed-optimization-nuw, bounds-safety-check-ptr-lt-upper-bound, bounds-safety-check-ptr-ge-lower-bound
// OPT-REM-NEXT: - String: |
// OPT-REM-NEXT: {{^[ ]+$}}
// OPT-REM-NEXT: {{^[ ]+$}}
// OPT-REM-NEXT: instructions:
// OPT-REM-EMPTY:
// OPT-REM-NEXT: - String: |
// OPT-REM-NEXT: other (LLVM IR 'shl')
// OPT-REM-NEXT: cmp ult (LLVM IR 'icmp')
// OPT-REM-NEXT: cmp uge (LLVM IR 'icmp')
// OPT-REM-NEXT: and (LLVM IR 'and')
// OPT-REM-NEXT: cond branch (LLVM IR 'br')
// OPT-REM-EMPTY:
// OPT-REM-NEXT: ...
// OPT-REM: ...

// OPT-REM-NEXT: --- !Analysis
// OPT-REM-NEXT: Pass: annotation-remarks
Expand Down Expand Up @@ -493,7 +497,7 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: Function: test_add
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Annotated '
// OPT-REM-NEXT: - count: '4'
// OPT-REM-NEXT: - count: '2'
// OPT-REM-NEXT: - String: ' instructions with '
// OPT-REM-NEXT: - type: bounds-safety-check-ptr-lt-upper-bound
// OPT-REM-NEXT: ...
Expand All @@ -506,7 +510,7 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: Function: test_add
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Annotated '
// OPT-REM-NEXT: - count: '4'
// OPT-REM-NEXT: - count: '2'
// OPT-REM-NEXT: - String: ' instructions with '
// OPT-REM-NEXT: - type: bounds-safety-check-ptr-ge-lower-bound
// OPT-REM-NEXT: ...
Expand All @@ -519,7 +523,7 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: Function: test_add
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Annotated '
// OPT-REM-NEXT: - count: '13'
// OPT-REM-NEXT: - count: '9'
// OPT-REM-NEXT: - String: ' instructions with '
// OPT-REM-NEXT: - type: bounds-safety-total-summary
// OPT-REM-NEXT: ...
Expand Down Expand Up @@ -643,33 +647,6 @@ void test_sub(int* __indexable A, int N) {
// OPT-REM-NEXT: - String: "trap (LLVM IR 'call')\nother (LLVM IR 'unreachable')"
// OPT-REM-NEXT: ...

// OPT-REM-NEXT: --- !Analysis
// OPT-REM-NEXT: Pass: annotation-remarks
// OPT-REM-NEXT: Name: BoundsSafetyCheck
// OPT-REM-NEXT: DebugLoc: { File: '{{.*}}bounds-safety-missed-binop-overflow.c',
// OPT-REM-NEXT: Line: 29, Column: 11 }
// OPT-REM-NEXT: Function: test_add
// OPT-REM-NEXT: Args:
// OPT-REM-NEXT: - String: 'Inserted '
// OPT-REM-NEXT: - count: '4'
// OPT-REM-NEXT: - String: ' LLVM IR instruction'
// OPT-REM-NEXT: - String: s
// OPT-REM-NEXT: - String: "\n"
// OPT-REM-NEXT: - String: "used for:\n"
// OPT-REM-NEXT: - String: bounds-safety-check-ptr-lt-upper-bound, bounds-safety-check-ptr-ge-lower-bound
// OPT-REM-NEXT: - String: |
// OPT-REM-NEXT: {{^[ ]+$}}
// OPT-REM-NEXT: {{^[ ]+$}}
// OPT-REM-NEXT: instructions:
// OPT-REM-EMPTY:
// OPT-REM-NEXT: - String: |
// OPT-REM-NEXT: cmp ult (LLVM IR 'icmp')
// OPT-REM-NEXT: cmp uge (LLVM IR 'icmp')
// OPT-REM-NEXT: and (LLVM IR 'and')
// OPT-REM-NEXT: cond branch (LLVM IR 'br')
// OPT-REM-EMPTY:
// OPT-REM-NEXT: ...

// OPT-REM-NEXT: --- !Analysis
// OPT-REM-NEXT: Pass: annotation-remarks
// OPT-REM-NEXT: Name: AnnotationSummary
Expand Down
40 changes: 5 additions & 35 deletions ...sSafety/CodeGen/range-check-optimizations-structs-with-arrays-no-bringup-missing-checks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,61 +38,31 @@ void array_member_access_can_remove(struct buf *bp) {
bp->arr[i] = i;
}

// rdar://138776402
// CHECK-LABEL: @array_member_access_trap_on_last_iter(
// CHECK-NEXT: cont1:
// CHECK-NEXT: [[UPPER:%.*]] = getelementptr inbounds i8, ptr [[BP:%.*]], i64 44
// CHECK-NEXT: [[ARR:%.*]] = getelementptr inbounds i8, ptr [[BP]], i64 4
// CHECK-NEXT: trap:
// CHECK-NEXT: [[ARR:%.*]] = getelementptr inbounds i8, ptr [[BP:%.*]], i64 4
// CHECK-NEXT: store i32 0, ptr [[ARR]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_1:%.*]] = getelementptr i8, ptr [[BP]], i64 8
// CHECK-NEXT: [[TMP0:%.*]] = icmp ult ptr [[ARRAYIDX_1]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP0]], label [[CONT1_1:%.*]], label [[TRAP:%.*]], {{!annotation ![0-9]+}}
// CHECK: trap:
// CHECK-NEXT: tail call void @llvm.ubsantrap(i8 25) {{#[0-9]+}}, {{!annotation ![0-9]+}}
// CHECK-NEXT: unreachable, {{!annotation ![0-9]+}}
// rdar://138776402
// CHECK: cont1.1:
// CHECK-NEXT: store i32 1, ptr [[ARRAYIDX_1]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_2:%.*]] = getelementptr i8, ptr [[BP]], i64 12
// CHECK-NEXT: [[TMP1:%.*]] = icmp ult ptr [[ARRAYIDX_2]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP1]], label [[CONT1_2:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.2:
// CHECK-NEXT: store i32 2, ptr [[ARRAYIDX_2]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_3:%.*]] = getelementptr i8, ptr [[BP]], i64 16
// CHECK-NEXT: [[TMP2:%.*]] = icmp ult ptr [[ARRAYIDX_3]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP2]], label [[CONT1_3:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.3:
// CHECK-NEXT: store i32 3, ptr [[ARRAYIDX_3]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_4:%.*]] = getelementptr i8, ptr [[BP]], i64 20
// CHECK-NEXT: [[TMP3:%.*]] = icmp ult ptr [[ARRAYIDX_4]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP3]], label [[CONT1_4:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.4:
// CHECK-NEXT: store i32 4, ptr [[ARRAYIDX_4]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_5:%.*]] = getelementptr i8, ptr [[BP]], i64 24
// CHECK-NEXT: [[TMP4:%.*]] = icmp ult ptr [[ARRAYIDX_5]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP4]], label [[CONT1_5:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.5:
// CHECK-NEXT: store i32 5, ptr [[ARRAYIDX_5]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_6:%.*]] = getelementptr i8, ptr [[BP]], i64 28
// CHECK-NEXT: [[TMP5:%.*]] = icmp ult ptr [[ARRAYIDX_6]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP5]], label [[CONT1_6:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.6:
// CHECK-NEXT: store i32 6, ptr [[ARRAYIDX_6]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_7:%.*]] = getelementptr i8, ptr [[BP]], i64 32
// CHECK-NEXT: [[TMP6:%.*]] = icmp ult ptr [[ARRAYIDX_7]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP6]], label [[CONT1_7:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.7:
// CHECK-NEXT: store i32 7, ptr [[ARRAYIDX_7]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_8:%.*]] = getelementptr i8, ptr [[BP]], i64 36
// CHECK-NEXT: [[TMP7:%.*]] = icmp ult ptr [[ARRAYIDX_8]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP7]], label [[CONT1_8:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.8:
// CHECK-NEXT: store i32 8, ptr [[ARRAYIDX_8]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: [[ARRAYIDX_9:%.*]] = getelementptr i8, ptr [[BP]], i64 40
// CHECK-NEXT: [[TMP8:%.*]] = icmp ult ptr [[ARRAYIDX_9]], [[UPPER]], {{!annotation ![0-9]+}}
// CHECK-NEXT: br i1 [[TMP8]], label [[CONT1_9:%.*]], label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK: cont1.9:
// CHECK-NEXT: store i32 9, ptr [[ARRAYIDX_9]], align 4, {{!tbaa ![0-9]+}}
// CHECK-NEXT: br label [[TRAP]], {{!annotation ![0-9]+}}
// CHECK-NEXT: tail call void @llvm.ubsantrap(i8 25) {{#[0-9]+}}, {{!annotation ![0-9]+}}
// CHECK-NEXT: unreachable, {{!annotation ![0-9]+}}
//
void array_member_access_trap_on_last_iter(struct buf *bp) {
for (int i = 0; i < 11; ++i)
Expand Down
Loading