Author: Aaron Ballman Date: 2025-04-17T07:13:31-04:00 New Revision: c536967af123c30b43f186133e8719e0090f24a6
URL: https://github.com/llvm/llvm-project/commit/c536967af123c30b43f186133e8719e0090f24a6 DIFF: https://github.com/llvm/llvm-project/commit/c536967af123c30b43f186133e8719e0090f24a6.diff LOG: Split _Countof tests into two files; NFC Post-commit review feedback during the language WG meeting requested that I try to generalize the testing for this rather than only test on a single target as we previously did. The tests which are hard to generalize are the VLA tests, so those still have specific triples in the RUN line, but have more coverage and a comment explaining that the test should generalize to all targets. Added: clang/test/C/C2y/n3369_3.c Modified: clang/test/C/C2y/n3369_2.c Removed: ################################################################################ diff --git a/clang/test/C/C2y/n3369_2.c b/clang/test/C/C2y/n3369_2.c index 0cbf362d38d4e..9cab828b461b5 100644 --- a/clang/test/C/C2y/n3369_2.c +++ b/clang/test/C/C2y/n3369_2.c @@ -1,116 +1,26 @@ // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5 -// RUN: %clang_cc1 -std=c2y -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck %s +// RUN: %clang_cc1 -std=c2y -emit-llvm -o - %s | FileCheck %s -// This tests the codegen behavior for _Countof. -// CHECK-LABEL: define dso_local i32 @test1( +// This tests the non-VLA codegen behavior for _Countof. + +typedef typeof(sizeof(0)) size_t; + +// CHECK-LABEL: define dso_local i64 @test1( // CHECK-SAME: ) #[[ATTR0:[0-9]+]] { // CHECK-NEXT: [[ENTRY:.*:]] -// CHECK-NEXT: [[ARRAY:%.*]] = alloca [12 x i32], align 16 -// CHECK-NEXT: ret i32 12 +// CHECK-NEXT: [[ARRAY:%.*]] = alloca [12 x i32], align +// CHECK-NEXT: ret i64 12 // -int test1() { +size_t test1() { int array[12]; return _Countof(array); } -// CHECK-LABEL: define dso_local i32 @test2( -// CHECK-SAME: i32 noundef [[N:%.*]]) #[[ATTR0]] { -// CHECK-NEXT: [[ENTRY:.*:]] -// CHECK-NEXT: [[N_ADDR:%.*]] = alloca i32, align 4 -// CHECK-NEXT: [[SAVED_STACK:%.*]] = alloca ptr, align 8 -// CHECK-NEXT: [[__VLA_EXPR0:%.*]] = alloca i64, align 8 -// CHECK-NEXT: store i32 [[N]], ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 -// CHECK-NEXT: [[TMP2:%.*]] = call ptr @llvm.stacksave.p0() -// CHECK-NEXT: store ptr [[TMP2]], ptr [[SAVED_STACK]], align 8 -// CHECK-NEXT: [[VLA:%.*]] = alloca i32, i64 [[TMP1]], align 16 -// CHECK-NEXT: store i64 [[TMP1]], ptr [[__VLA_EXPR0]], align 8 -// CHECK-NEXT: [[CONV:%.*]] = trunc i64 [[TMP1]] to i32 -// CHECK-NEXT: [[TMP3:%.*]] = load ptr, ptr [[SAVED_STACK]], align 8 -// CHECK-NEXT: call void @llvm.stackrestore.p0(ptr [[TMP3]]) -// CHECK-NEXT: ret i32 [[CONV]] -// -int test2(int n) { - int array[n]; - return _Countof(array); -} - -// CHECK-LABEL: define dso_local i32 @test3( -// CHECK-SAME: i32 noundef [[N:%.*]]) #[[ATTR0]] { -// CHECK-NEXT: [[ENTRY:.*:]] -// CHECK-NEXT: [[N_ADDR:%.*]] = alloca i32, align 4 -// CHECK-NEXT: store i32 [[N]], ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 -// CHECK-NEXT: [[CONV:%.*]] = trunc i64 [[TMP1]] to i32 -// CHECK-NEXT: ret i32 [[CONV]] -// -int test3(int n) { - return _Countof(int[n]); -} - -// CHECK-LABEL: define dso_local i32 @test4( +// CHECK-LABEL: define dso_local i64 @test2( // CHECK-SAME: ) #[[ATTR0]] { // CHECK-NEXT: [[ENTRY:.*:]] -// CHECK-NEXT: ret i32 100 +// CHECK-NEXT: ret i64 100 // -int test4() { +size_t test2() { return _Countof(float[100]); } - -// CHECK-LABEL: define dso_local i32 @test5( -// CHECK-SAME: i32 noundef [[N:%.*]]) #[[ATTR0]] { -// CHECK-NEXT: [[ENTRY:.*:]] -// CHECK-NEXT: [[N_ADDR:%.*]] = alloca i32, align 4 -// CHECK-NEXT: [[SAVED_STACK:%.*]] = alloca ptr, align 8 -// CHECK-NEXT: [[__VLA_EXPR0:%.*]] = alloca i64, align 8 -// CHECK-NEXT: [[X:%.*]] = alloca i32, align 4 -// CHECK-NEXT: [[Y:%.*]] = alloca i32, align 4 -// CHECK-NEXT: store i32 [[N]], ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 -// CHECK-NEXT: [[TMP2:%.*]] = call ptr @llvm.stacksave.p0() -// CHECK-NEXT: store ptr [[TMP2]], ptr [[SAVED_STACK]], align 8 -// CHECK-NEXT: [[VLA:%.*]] = alloca [7 x i32], i64 [[TMP1]], align 16 -// CHECK-NEXT: store i64 [[TMP1]], ptr [[__VLA_EXPR0]], align 8 -// CHECK-NEXT: [[CONV:%.*]] = trunc i64 [[TMP1]] to i32 -// CHECK-NEXT: store i32 [[CONV]], ptr [[X]], align 4 -// CHECK-NEXT: store i32 7, ptr [[Y]], align 4 -// CHECK-NEXT: [[TMP3:%.*]] = load i32, ptr [[X]], align 4 -// CHECK-NEXT: [[TMP4:%.*]] = load i32, ptr [[Y]], align 4 -// CHECK-NEXT: [[ADD:%.*]] = add nsw i32 [[TMP3]], [[TMP4]] -// CHECK-NEXT: [[TMP5:%.*]] = load ptr, ptr [[SAVED_STACK]], align 8 -// CHECK-NEXT: call void @llvm.stackrestore.p0(ptr [[TMP5]]) -// CHECK-NEXT: ret i32 [[ADD]] -// -int test5(int n) { - int array[n][7]; - int x = _Countof(array); - int y = _Countof(*array); - return x + y; -} - -// CHECK-LABEL: define dso_local void @test6( -// CHECK-SAME: i32 noundef [[N:%.*]]) #[[ATTR0]] { -// CHECK-NEXT: [[ENTRY:.*:]] -// CHECK-NEXT: [[N_ADDR:%.*]] = alloca i32, align 4 -// CHECK-NEXT: [[X:%.*]] = alloca i32, align 4 -// CHECK-NEXT: [[Y:%.*]] = alloca i32, align 4 -// CHECK-NEXT: store i32 [[N]], ptr [[N_ADDR]], align 4 -// CHECK-NEXT: store i32 7, ptr [[X]], align 4 -// CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[INC:%.*]] = add nsw i32 [[TMP0]], 1 -// CHECK-NEXT: store i32 [[INC]], ptr [[N_ADDR]], align 4 -// CHECK-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 -// CHECK-NEXT: [[CONV:%.*]] = trunc i64 [[TMP1]] to i32 -// CHECK-NEXT: store i32 [[CONV]], ptr [[Y]], align 4 -// CHECK-NEXT: ret void -// -void test6(int n) { - // n should not be evaluated in this case because the operator does not need - // to evaluate it to know the result is 7. - int x = _Countof(int[7][n++]); - // n should be evaluated in this case, however. - int y = _Countof(int[n++][7]); -} diff --git a/clang/test/C/C2y/n3369_3.c b/clang/test/C/C2y/n3369_3.c new file mode 100644 index 0000000000000..d3909b2e5bc92 --- /dev/null +++ b/clang/test/C/C2y/n3369_3.c @@ -0,0 +1,166 @@ +// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5 +// RUN: %clang_cc1 -std=c2y -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-64 +// RUN: %clang_cc1 -std=c2y -triple aarch64-unknown-unknown -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-64 +// RUN: %clang_cc1 -std=c2y -triple ppc64le-unknown-unknown -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-64 +// RUN: %clang_cc1 -std=c2y -triple i686-unknown-unknown -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-32 + +// This tests the codegen behavior for VLA use in _Countof, which builds upon +// the code generation for sizeof. It tests a limited set of triples due to +// variations in VLA handling between platforms, but this test should +// generalize to all targets. + +typedef typeof(sizeof(0)) size_t; + +// CHECK-64-LABEL: define dso_local i64 @test1( +// CHECK-64-SAME: i32 noundef{{( signext)?}} [[N:%.*]]) #[[ATTR0:[0-9]+]] { +// CHECK-64-NEXT: [[ENTRY:.*:]] +// CHECK-64-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-64-NEXT: [[SAVED_STACK:%.*]] = alloca ptr, align +// CHECK-64-NEXT: [[__VLA_EXPR0:%.*]] = alloca i64, align +// CHECK-64-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 +// CHECK-64-NEXT: [[TMP2:%.*]] = call ptr @llvm.stacksave.p0() +// CHECK-64-NEXT: store ptr [[TMP2]], ptr [[SAVED_STACK]], align +// CHECK-64-NEXT: [[VLA:%.*]] = alloca i32, i64 [[TMP1]], align +// CHECK-64-NEXT: store i64 [[TMP1]], ptr [[__VLA_EXPR0]], align +// CHECK-64-NEXT: [[TMP3:%.*]] = load ptr, ptr [[SAVED_STACK]], align +// CHECK-64-NEXT: call void @llvm.stackrestore.p0(ptr [[TMP3]]) +// CHECK-64-NEXT: ret i64 [[TMP1]] +// +// CHECK-32-LABEL: define dso_local i32 @test1( +// CHECK-32-SAME: i32 noundef [[N:%.*]]) #[[ATTR0:[0-9]+]] { +// CHECK-32-NEXT: [[ENTRY:.*:]] +// CHECK-32-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-32-NEXT: [[SAVED_STACK:%.*]] = alloca ptr, align +// CHECK-32-NEXT: [[__VLA_EXPR0:%.*]] = alloca i32, align +// CHECK-32-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-32-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-32-NEXT: [[TMP1:%.*]] = call ptr @llvm.stacksave.p0() +// CHECK-32-NEXT: store ptr [[TMP1]], ptr [[SAVED_STACK]], align +// CHECK-32-NEXT: [[VLA:%.*]] = alloca i32, i32 [[TMP0]], align +// CHECK-32-NEXT: store i32 [[TMP0]], ptr [[__VLA_EXPR0]], align +// CHECK-32-NEXT: [[TMP2:%.*]] = load ptr, ptr [[SAVED_STACK]], align +// CHECK-32-NEXT: call void @llvm.stackrestore.p0(ptr [[TMP2]]) +// CHECK-32-NEXT: ret i32 [[TMP0]] +// +size_t test1(int n) { + int array[n]; + return _Countof(array); +} + +// CHECK-64-LABEL: define dso_local i64 @test2( +// CHECK-64-SAME: i32 noundef{{( signext)?}} [[N:%.*]]) #[[ATTR0]] { +// CHECK-64-NEXT: [[ENTRY:.*:]] +// CHECK-64-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-64-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 +// CHECK-64-NEXT: ret i64 [[TMP1]] +// +// CHECK-32-LABEL: define dso_local i32 @test2( +// CHECK-32-SAME: i32 noundef [[N:%.*]]) #[[ATTR0]] { +// CHECK-32-NEXT: [[ENTRY:.*:]] +// CHECK-32-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-32-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-32-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-32-NEXT: ret i32 [[TMP0]] +// +size_t test2(int n) { + return _Countof(int[n]); +} + +// CHECK-64-LABEL: define dso_local i64 @test3( +// CHECK-64-SAME: i32 noundef{{( signext)?}} [[N:%.*]]) #[[ATTR0]] { +// CHECK-64-NEXT: [[ENTRY:.*:]] +// CHECK-64-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-64-NEXT: [[SAVED_STACK:%.*]] = alloca ptr, align +// CHECK-64-NEXT: [[__VLA_EXPR0:%.*]] = alloca i64, align +// CHECK-64-NEXT: [[X:%.*]] = alloca i32, align +// CHECK-64-NEXT: [[Y:%.*]] = alloca i32, align +// CHECK-64-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 +// CHECK-64-NEXT: [[TMP2:%.*]] = call ptr @llvm.stacksave.p0() +// CHECK-64-NEXT: store ptr [[TMP2]], ptr [[SAVED_STACK]], align +// CHECK-64-NEXT: [[VLA:%.*]] = alloca [7 x i32], i64 [[TMP1]], align +// CHECK-64-NEXT: store i64 [[TMP1]], ptr [[__VLA_EXPR0]], align +// CHECK-64-NEXT: [[CONV:%.*]] = trunc i64 [[TMP1]] to i32 +// CHECK-64-NEXT: store i32 [[CONV]], ptr [[X]], align +// CHECK-64-NEXT: store i32 7, ptr [[Y]], align +// CHECK-64-NEXT: [[TMP3:%.*]] = load i32, ptr [[X]], align +// CHECK-64-NEXT: [[TMP4:%.*]] = load i32, ptr [[Y]], align +// CHECK-64-NEXT: [[ADD:%.*]] = add nsw i32 [[TMP3]], [[TMP4]] +// CHECK-64-NEXT: [[CONV1:%.*]] = sext i32 [[ADD]] to i64 +// CHECK-64-NEXT: [[TMP5:%.*]] = load ptr, ptr [[SAVED_STACK]], align +// CHECK-64-NEXT: call void @llvm.stackrestore.p0(ptr [[TMP5]]) +// CHECK-64-NEXT: ret i64 [[CONV1]] +// +// CHECK-32-LABEL: define dso_local i32 @test3( +// CHECK-32-SAME: i32 noundef [[N:%.*]]) #[[ATTR0]] { +// CHECK-32-NEXT: [[ENTRY:.*:]] +// CHECK-32-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-32-NEXT: [[SAVED_STACK:%.*]] = alloca ptr, align +// CHECK-32-NEXT: [[__VLA_EXPR0:%.*]] = alloca i32, align +// CHECK-32-NEXT: [[X:%.*]] = alloca i32, align +// CHECK-32-NEXT: [[Y:%.*]] = alloca i32, align +// CHECK-32-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-32-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-32-NEXT: [[TMP1:%.*]] = call ptr @llvm.stacksave.p0() +// CHECK-32-NEXT: store ptr [[TMP1]], ptr [[SAVED_STACK]], align +// CHECK-32-NEXT: [[VLA:%.*]] = alloca [7 x i32], i32 [[TMP0]], align +// CHECK-32-NEXT: store i32 [[TMP0]], ptr [[__VLA_EXPR0]], align +// CHECK-32-NEXT: store i32 [[TMP0]], ptr [[X]], align +// CHECK-32-NEXT: store i32 7, ptr [[Y]], align +// CHECK-32-NEXT: [[TMP2:%.*]] = load i32, ptr [[X]], align +// CHECK-32-NEXT: [[TMP3:%.*]] = load i32, ptr [[Y]], align +// CHECK-32-NEXT: [[ADD:%.*]] = add nsw i32 [[TMP2]], [[TMP3]] +// CHECK-32-NEXT: [[TMP4:%.*]] = load ptr, ptr [[SAVED_STACK]], align +// CHECK-32-NEXT: call void @llvm.stackrestore.p0(ptr [[TMP4]]) +// CHECK-32-NEXT: ret i32 [[ADD]] +// +size_t test3(int n) { + int array[n][7]; + int x = _Countof(array); + int y = _Countof(*array); + return x + y; +} + +// CHECK-64-LABEL: define dso_local void @test4( +// CHECK-64-SAME: i32 noundef{{( signext)?}} [[N:%.*]]) #[[ATTR0]] { +// CHECK-64-NEXT: [[ENTRY:.*:]] +// CHECK-64-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-64-NEXT: [[X:%.*]] = alloca i32, align +// CHECK-64-NEXT: [[Y:%.*]] = alloca i32, align +// CHECK-64-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-64-NEXT: store i32 7, ptr [[X]], align +// CHECK-64-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[INC:%.*]] = add nsw i32 [[TMP0]], 1 +// CHECK-64-NEXT: store i32 [[INC]], ptr [[N_ADDR]], align +// CHECK-64-NEXT: [[TMP1:%.*]] = zext i32 [[TMP0]] to i64 +// CHECK-64-NEXT: [[CONV:%.*]] = trunc i64 [[TMP1]] to i32 +// CHECK-64-NEXT: store i32 [[CONV]], ptr [[Y]], align +// CHECK-64-NEXT: ret void +// +// CHECK-32-LABEL: define dso_local void @test4( +// CHECK-32-SAME: i32 noundef [[N:%.*]]) #[[ATTR0]] { +// CHECK-32-NEXT: [[ENTRY:.*:]] +// CHECK-32-NEXT: [[N_ADDR:%.*]] = alloca i32, align +// CHECK-32-NEXT: [[X:%.*]] = alloca i32, align +// CHECK-32-NEXT: [[Y:%.*]] = alloca i32, align +// CHECK-32-NEXT: store i32 [[N]], ptr [[N_ADDR]], align +// CHECK-32-NEXT: store i32 7, ptr [[X]], align +// CHECK-32-NEXT: [[TMP0:%.*]] = load i32, ptr [[N_ADDR]], align +// CHECK-32-NEXT: [[INC:%.*]] = add nsw i32 [[TMP0]], 1 +// CHECK-32-NEXT: store i32 [[INC]], ptr [[N_ADDR]], align +// CHECK-32-NEXT: store i32 [[TMP0]], ptr [[Y]], align +// CHECK-32-NEXT: ret void +// +void test4(int n) { + // n should not be evaluated in this case because the operator does not need + // to evaluate it to know the result is 7. + int x = _Countof(int[7][n++]); + // n should be evaluated in this case, however. + int y = _Countof(int[n++][7]); +} + _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
