llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clangir Author: Amr Hesham (AmrDeveloper) <details> <summary>Changes</summary> Follow-up patch to improve variable names in LLVM and OGCG in https://github.com/llvm/llvm-project/pull/134536 --- Full diff: https://github.com/llvm/llvm-project/pull/135427.diff 1 Files Affected: - (modified) clang/test/CIR/CodeGen/array.cpp (+55-54) ``````````diff diff --git a/clang/test/CIR/CodeGen/array.cpp b/clang/test/CIR/CodeGen/array.cpp index 431164c797f76..5cda061cdbf12 100644 --- a/clang/test/CIR/CodeGen/array.cpp +++ b/clang/test/CIR/CodeGen/array.cpp @@ -94,26 +94,27 @@ void func() { // CIR" cir.store %[[TMP]], %[[INIT_2]] : !s32i, !cir.ptr<!s32i> // LLVM: define void @func() -// LLVM-NEXT: %[[ARR_ALLOCA:.*]] = alloca [10 x i32], i64 1, align 16 +// LLVM-NEXT: %[[ARR:.*]] = alloca [10 x i32], i64 1, align 16 // LLVM-NEXT: %[[INIT:.*]] = alloca i32, i64 1, align 4 // LLVM-NEXT: %[[INIT_2:.*]] = alloca i32, i64 1, align 4 -// LLVM-NEXT: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR_ALLOCA]], i32 0 +// LLVM-NEXT: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR]], i32 0 // LLVM-NEXT: %[[ELE_PTR:.*]] = getelementptr i32, ptr %[[ARR_PTR]], i64 0 -// LLVM-NEXT: %[[TMP:.*]] = load i32, ptr %[[ELE_PTR]], align 4 -// LLVM-NEXT: store i32 %[[TMP]], ptr %[[INIT]], align 4 -// LLVM-NEXT: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR_ALLOCA]], i32 0 +// LLVM-NEXT: %[[TMP_1:.*]] = load i32, ptr %[[ELE_PTR]], align 4 +// LLVM-NEXT: store i32 %[[TMP_1]], ptr %[[INIT]], align 4 +// LLVM-NEXT: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR]], i32 0 // LLVM-NEXT: %[[ELE_PTR:.*]] = getelementptr i32, ptr %[[ARR_PTR]], i64 1 -// LLVM-NEXT: %[[TMP:.*]] = load i32, ptr %[[ELE_PTR]], align 4 - -// OGCG: %arr = alloca [10 x i32], align 16 -// OGCG: %e = alloca i32, align 4 -// OGCG: %e2 = alloca i32, align 4 -// OGCG: %arrayidx = getelementptr inbounds [10 x i32], ptr %arr, i64 0, i64 0 -// OGCG: %0 = load i32, ptr %arrayidx, align 16 -// OGCG: store i32 %0, ptr %e, align 4 -// OGCG: %arrayidx1 = getelementptr inbounds [10 x i32], ptr %arr, i64 0, i64 1 -// OGCG: %1 = load i32, ptr %arrayidx1, align 4 -// OGCG: store i32 %1, ptr %e2, align 4 +// LLVM-NEXT: %[[TMP_2:.*]] = load i32, ptr %[[ELE_PTR]], align 4 +// LLVM-NEXT: store i32 %[[TMP_2]], ptr %[[INIT_2]], align 4 + +// OGCG: %[[ARR:.*]] = alloca [10 x i32], align 16 +// OGCG: %[[INIT:.*]] = alloca i32, align 4 +// OGCG: %[[INIT_2:.*]] = alloca i32, align 4 +// OGCG: %[[ELE_PTR:.*]] = getelementptr inbounds [10 x i32], ptr %[[ARR]], i64 0, i64 0 +// OGCG: %[[TMP_1:.*]] = load i32, ptr %[[ELE_PTR]], align 16 +// OGCG: store i32 %[[TMP_1]], ptr %[[INIT]], align 4 +// OGCG: %[[ELE_PTR:.*]] = getelementptr inbounds [10 x i32], ptr %[[ARR]], i64 0, i64 1 +// OGCG: %[[TMP_2:.*]] = load i32, ptr %[[ELE_PTR]], align 4 +// OGCG: store i32 %[[TMP_2]], ptr %[[INIT_2]], align 4 void func2() { int arr[2] = {5}; @@ -135,9 +136,9 @@ void func2() { // CIR: cir.store %[[ELE_1_PTR]], %[[ELE_ALLOCA]] : !cir.ptr<!s32i>, !cir.ptr<!cir.ptr<!s32i>> // LLVM: define void @func2() -// LLVM: %[[ARR_ALLOCA:.*]] = alloca [2 x i32], i64 1, align 4 +// LLVM: %[[ARR:.*]] = alloca [2 x i32], i64 1, align 4 // LLVM: %[[TMP:.*]] = alloca ptr, i64 1, align 8 -// LLVM: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR_ALLOCA]], i32 0 +// LLVM: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR]], i32 0 // LLVM: store i32 5, ptr %[[ARR_PTR]], align 4 // LLVM: %[[ELE_1_PTR:.*]] = getelementptr i32, ptr %[[ARR_PTR]], i64 1 // LLVM: store ptr %[[ELE_1_PTR]], ptr %[[TMP]], align 8 @@ -146,8 +147,8 @@ void func2() { // LLVM: %[[ELE_1:.*]] = getelementptr i32, ptr %[[TMP2]], i64 1 // LLVM: store ptr %[[ELE_1]], ptr %[[TMP]], align 8 -// OGCG: %arr = alloca [2 x i32], align 4 -// OGCG: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %arr, ptr align 4 @[[FUN2_ARR]], i64 8, i1 false) +// OGCG: %[[ARR:.*]] = alloca [2 x i32], align 4 +// OGCG: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %[[ARR]], ptr align 4 @[[FUN2_ARR]], i64 8, i1 false) void func3() { int arr[2] = {5, 6}; @@ -175,31 +176,31 @@ void func3() { // CIR: cir.store %[[ELE_TMP]], %[[INIT]] : !s32i, !cir.ptr<!s32i> // LLVM: define void @func3() -// LLVM: %[[ARR_ALLOCA:.*]] = alloca [2 x i32], i64 1, align 4 +// LLVM: %[[ARR:.*]] = alloca [2 x i32], i64 1, align 4 // LLVM: %[[IDX:.*]] = alloca i32, i64 1, align 4 // LLVM: %[[INIT:.*]] = alloca i32, i64 1, align 4 -// LLVM: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR_ALLOCA]], i32 0 +// LLVM: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR]], i32 0 // LLVM: store i32 5, ptr %[[ARR_PTR]], align 4 // LLVM: %[[ELE_1_PTR:.*]] = getelementptr i32, ptr %[[ARR_PTR]], i64 1 // LLVM: store i32 6, ptr %[[ELE_1_PTR]], align 4 // LLVM: store i32 1, ptr %[[IDX]], align 4 // LLVM: %[[TMP1:.*]] = load i32, ptr %[[IDX]], align 4 -// LLVM: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR_ALLOCA]], i32 0 +// LLVM: %[[ARR_PTR:.*]] = getelementptr i32, ptr %[[ARR]], i32 0 // LLVM: %[[IDX_I64:.*]] = sext i32 %[[TMP1]] to i64 // LLVM: %[[ELE:.*]] = getelementptr i32, ptr %[[ARR_PTR]], i64 %[[IDX_I64]] // LLVM: %[[TMP2:.*]] = load i32, ptr %[[ELE]], align 4 // LLVM: store i32 %[[TMP2]], ptr %[[INIT]], align 4 -// OGCG: %arr = alloca [2 x i32], align 4 -// OGCG: %idx = alloca i32, align 4 -// OGCG: %e = alloca i32, align 4 -// OGCG: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %arr, ptr align 4 @[[FUN3_ARR]], i64 8, i1 false) -// OGCG: store i32 1, ptr %idx, align 4 -// OGCG: %0 = load i32, ptr %idx, align 4 -// OGCG: %idxprom = sext i32 %0 to i64 -// OGCG: %arrayidx = getelementptr inbounds [2 x i32], ptr %arr, i64 0, i64 %idxprom -// OGCG: %1 = load i32, ptr %arrayidx, align 4 -// OGCG: store i32 %1, ptr %e, align 4 +// OGCG: %[[ARR:.*]] = alloca [2 x i32], align 4 +// OGCG: %[[IDX:.*]] = alloca i32, align 4 +// OGCG: %[[INIT:.*]] = alloca i32, align 4 +// OGCG: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %[[ARR]], ptr align 4 @[[FUN3_ARR]], i64 8, i1 false) +// OGCG: store i32 1, ptr %[[IDX]], align 4 +// OGCG: %[[TMP:.*]] = load i32, ptr %[[IDX]], align 4 +// OGCG: %[[IDX_I64:.*]] = sext i32 %[[TMP]] to i64 +// OGCG: %[[ELE:.*]] = getelementptr inbounds [2 x i32], ptr %[[ARR]], i64 0, i64 %[[IDX_I64]] +// OGCG: %[[TMP_2:.*]] = load i32, ptr %[[ELE]], align 4 +// OGCG: store i32 %[[TMP_2:.*]], ptr %[[INIT]], align 4 void func4() { int arr[2][1] = {{5}, {6}}; @@ -227,28 +228,28 @@ void func4() { // CIR: cir.store %[[TMP]], %[[INIT]] : !s32i, !cir.ptr<!s32i> // LLVM: define void @func4() -// LLVM: %[[ARR_ALLOCA:.*]] = alloca [2 x [1 x i32]], i64 1, align 4 +// LLVM: %[[ARR:.*]] = alloca [2 x [1 x i32]], i64 1, align 4 // LLVM: %[[INIT:.*]] = alloca i32, i64 1, align 4 -// LLVM: %[[ARR_PTR:.*]] = getelementptr [1 x i32], ptr %[[ARR_ALLOCA]], i32 0 +// LLVM: %[[ARR_PTR:.*]] = getelementptr [1 x i32], ptr %[[ARR]], i32 0 // LLVM: %[[ARR_0_0:.*]] = getelementptr i32, ptr %[[ARR_PTR]], i32 0 // LLVM: store i32 5, ptr %[[ARR_0_0]], align 4 // LLVM: %[[ARR_1:.*]] = getelementptr [1 x i32], ptr %[[ARR_PTR]], i64 1 // LLVM: %[[ARR_1_0:.*]] = getelementptr i32, ptr %[[ARR_1]], i32 0 // LLVM: store i32 6, ptr %[[ARR_1_0]], align 4 -// LLVM: %[[ARR_PTR:.*]] = getelementptr [1 x i32], ptr %[[ARR_ALLOCA]], i32 0 +// LLVM: %[[ARR_PTR:.*]] = getelementptr [1 x i32], ptr %[[ARR]], i32 0 // LLVM: %[[ARR_1:.*]] = getelementptr [1 x i32], ptr %[[ARR_PTR]], i64 1 // LLVM: %[[ARR_1_0:.*]] = getelementptr i32, ptr %[[ARR_1]], i32 0 // LLVM: %[[ELE_PTR:.*]] = getelementptr i32, ptr %[[ARR_1_0]], i64 0 // LLVM: %[[TMP:.*]] = load i32, ptr %[[ELE_PTR]], align 4 // LLVM: store i32 %[[TMP]], ptr %[[INIT]], align 4 -// OGCG: %arr = alloca [2 x [1 x i32]], align 4 -// OGCG: %e = alloca i32, align 4 -// OGCG: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %arr, ptr align 4 @[[FUN4_ARR]], i64 8, i1 false) -// OGCG: %arrayidx = getelementptr inbounds [2 x [1 x i32]], ptr %arr, i64 0, i64 1 -// OGCG: %arrayidx1 = getelementptr inbounds [1 x i32], ptr %arrayidx, i64 0, i64 0 -// OGCG: %0 = load i32, ptr %arrayidx1, align 4 -// OGCG: store i32 %0, ptr %e, align 4 +// OGCG: %[[ARR:.*]] = alloca [2 x [1 x i32]], align 4 +// OGCG: %[[INIT:.*]] = alloca i32, align 4 +// OGCG: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %[[ARR]], ptr align 4 @[[FUN4_ARR]], i64 8, i1 false) +// OGCG: %[[ARR_1:.*]] = getelementptr inbounds [2 x [1 x i32]], ptr %[[ARR]], i64 0, i64 1 +// OGCG: %[[ARR_1_0:.*]] = getelementptr inbounds [1 x i32], ptr %[[ARR_1]], i64 0, i64 0 +// OGCG: %[[TMP:.*]] = load i32, ptr %[[ARR_1_0]], align 4 +// OGCG: store i32 %[[TMP]], ptr %[[INIT]], align 4 void func5() { int arr[2][1] = {{5}}; @@ -271,9 +272,9 @@ void func5() { // CIR: cir.store %10, %[[ARR_PTR]] : !cir.ptr<!cir.array<!s32i x 1>>, !cir.ptr<!cir.ptr<!cir.array<!s32i x 1>>> // LLVM: define void @func5() -// LLVM: %[[ARR_ALLOCA:.*]] = alloca [2 x [1 x i32]], i64 1, align 4 +// LLVM: %[[ARR:.*]] = alloca [2 x [1 x i32]], i64 1, align 4 // LLVM: %[[TMP:.*]] = alloca ptr, i64 1, align 8 -// LLVM: %[[ARR_PTR:.*]] = getelementptr [1 x i32], ptr %[[ARR_ALLOCA]], i32 0 +// LLVM: %[[ARR_PTR:.*]] = getelementptr [1 x i32], ptr %[[ARR]], i32 0 // LLVM: %[[ARR_0:.*]] = getelementptr i32, ptr %[[ARR_PTR]], i32 0 // LLVM: store i32 5, ptr %[[ARR_0]], align 4 // LLVM: %[[ARR_1:.*]] = getelementptr [1 x i32], ptr %[[ARR_PTR]], i64 1 @@ -283,8 +284,8 @@ void func5() { // LLVM: %[[ARR_1_PTR:.*]] = getelementptr [1 x i32], ptr %[[ARR_1_VAL]], i64 1 // LLVM: store ptr %[[ARR_1_PTR]], ptr %[[TMP]], align 8 -// ORGC: %arr = alloca [2 x [1 x i32]], align 4 -// ORGC: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %arr, ptr align 4 @[[FUN5_ARR]], i64 8, i1 false) +// ORGC: %[[ARR:.*]] = alloca [2 x [1 x i32]], align 4 +// ORGC: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %[[ARR]], ptr align 4 @[[FUN5_ARR]], i64 8, i1 false) void func6() { int x = 4; @@ -313,13 +314,13 @@ void func6() { // LLVM: %[[ELE_1:.*]] = getelementptr i32, ptr %[[ELE_0]], i64 1 // LLVM: store i32 5, ptr %[[ELE_1]], align 4 -// OGCG: %x = alloca i32, align 4 -// OGCG: %arr = alloca [2 x i32], align 4 -// OGCG: store i32 4, ptr %x, align 4 -// OGCG: %0 = load i32, ptr %x, align 4 -// OGCG: store i32 %0, ptr %arr, align 4 -// OGCG: %arrayinit.element = getelementptr inbounds i32, ptr %arr, i64 1 -// OGCG: store i32 5, ptr %arrayinit.element, align 4 +// OGCG: %[[VAR:.*]] = alloca i32, align 4 +// OGCG: %[[ARR:.*]] = alloca [2 x i32], align 4 +// OGCG: store i32 4, ptr %[[VAR]], align 4 +// OGCG: %[[ELE_0:.*]] = load i32, ptr %[[VAR]], align 4 +// OGCG: store i32 %[[ELE_0]], ptr %[[ARR]], align 4 +// OGCG: %[[ELE_1:.*]] = getelementptr inbounds i32, ptr %[[ARR]], i64 1 +// OGCG: store i32 5, ptr %[[ELE_1:.*]], align 4 void func7() { int* arr[1] = {}; `````````` </details> https://github.com/llvm/llvm-project/pull/135427 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
