[llvm] a6a0cf7 - Revert "(NFC)[ConstantFold][InstSimplify] add tests for folding load for patterned arrays and structs"

via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 23 02:37:10 PST 2023


Author: khei4
Date: 2023-02-23T19:36:11+09:00
New Revision: a6a0cf7bca726427c3735499d091986477168a62

URL: https://github.com/llvm/llvm-project/commit/a6a0cf7bca726427c3735499d091986477168a62
DIFF: https://github.com/llvm/llvm-project/commit/a6a0cf7bca726427c3735499d091986477168a62.diff

LOG: Revert "(NFC)[ConstantFold][InstSimplify] add tests for folding load for patterned arrays and structs"

This reverts commit 9636bcd3a0091b0bb77250182ac0c549112f9196.

Added: 
    

Modified: 
    llvm/test/Transforms/InstSimplify/load.ll

Removed: 
    llvm/test/Transforms/InstSimplify/load-patterned-aggregates.ll


################################################################################
diff  --git a/llvm/test/Transforms/InstSimplify/load-patterned-aggregates.ll b/llvm/test/Transforms/InstSimplify/load-patterned-aggregates.ll
deleted file mode 100644
index 82283648936cf..0000000000000
--- a/llvm/test/Transforms/InstSimplify/load-patterned-aggregates.ll
+++ /dev/null
@@ -1,134 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -passes=instsimplify -S | FileCheck %s
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32"
- at constzeroarray = internal constant [4 x i32] zeroinitializer
-
- at constarray = internal constant [8 x i8]  c"\01\00\01\00\01\00\01\00", align 4
- at conststruct = internal constant <{[8 x i8]}>  <{[8 x i8] c"\01\00\01\00\01\00\01\00"}>, align 4
-
-define i32 @load_gep_const_zero_array(i64 %idx) {
-; CHECK-LABEL: @load_gep_const_zero_array(
-; CHECK-NEXT:    ret i32 0
-;
-  %gep = getelementptr inbounds [4 x i32], ptr @constzeroarray, i64 0, i64 %idx
-  %load = load i32, ptr %gep
-  ret i32 %load
-}
-
-define i8 @load_i8_multi_gep_const_zero_array(i64 %idx1, i64 %idx2) {
-; CHECK-LABEL: @load_i8_multi_gep_const_zero_array(
-; CHECK-NEXT:    ret i8 0
-;
-  %gep1 = getelementptr inbounds i8, ptr @constzeroarray, i64 %idx1
-  %gep = getelementptr inbounds i8, ptr %gep1, i64 %idx2
-  %load = load i8, ptr %gep
-  ret i8 %load
-}
-
-
-define i32 @load_gep_const_patterned_array(i64 %idx) {
-; CHECK-LABEL: @load_gep_const_patterned_array(
-; CHECK-NEXT:    [[GEP:%.*]] = getelementptr inbounds [4 x i32], ptr @constarray, i64 0, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[LOAD:%.*]] = load i32, ptr [[GEP]], align 4
-; CHECK-NEXT:    ret i32 [[LOAD]]
-;
-  %gep = getelementptr inbounds [4 x i32], ptr @constarray, i64 0, i64 %idx
-  %load = load i32, ptr %gep
-  ret i32 %load
-}
-
-define i8 @load_i8_multi_gep_const_array(i64 %idx1, i64 %idx2) {
-; CHECK-LABEL: @load_i8_multi_gep_const_array(
-; CHECK-NEXT:    [[GEP1:%.*]] = getelementptr inbounds i8, ptr @constarray, i64 [[IDX1:%.*]]
-; CHECK-NEXT:    [[GEP:%.*]] = getelementptr inbounds i8, ptr [[GEP1]], i64 [[IDX2:%.*]]
-; CHECK-NEXT:    [[LOAD:%.*]] = load i8, ptr [[GEP]], align 1
-; CHECK-NEXT:    ret i8 [[LOAD]]
-;
-  %gep1 = getelementptr inbounds i8, ptr @constarray, i64 %idx1
-  %gep = getelementptr inbounds i8, ptr %gep1, i64 %idx2
-  %load = load i8, ptr %gep
-  ret i8 %load
-}
-
-; TODO: this should be ret i8 1
-define i8 @gep_load_i8_align2(i64 %idx){
-; CHECK-LABEL: @gep_load_i8_align2(
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr @constarray, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[TMP2:%.*]] = load i8, ptr [[TMP1]], align 2
-; CHECK-NEXT:    ret i8 [[TMP2]]
-;
-  %1 = getelementptr inbounds i8, ptr @constarray, i64 %idx
-  %2 = load i8, ptr %1, align 2
-  ret i8 %2
-}
-
-; can't be folded
-define i8 @gep_load_i8_align1(i64 %idx){
-; CHECK-LABEL: @gep_load_i8_align1(
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr @constarray, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[TMP2:%.*]] = load i8, ptr [[TMP1]], align 1
-; CHECK-NEXT:    ret i8 [[TMP2]]
-;
-  %1 = getelementptr inbounds i8, ptr @constarray, i64 %idx
-  %2 = load i8, ptr %1, align 1
-  ret i8 %2
-}
-
-; TODO: this should be ret i8 65537 on the case for little endian
-define i32 @gep_i32_load_i32_align4(i64 %idx){
-; CHECK-LABEL: @gep_i32_load_i32_align4(
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i32, ptr @constarray, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[TMP1]], align 4
-; CHECK-NEXT:    ret i32 [[TMP2]]
-;
-  %1 = getelementptr inbounds i32, ptr @constarray, i64 %idx
-  %2 = load i32, ptr %1, align 4
-  ret i32 %2
-}
-
-; TODO: this should be ret i8 65537 on the case for little endian
-define i32 @gep_i32_load_i32_align4_struct(i64 %idx){
-; CHECK-LABEL: @gep_i32_load_i32_align4_struct(
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i32, ptr @conststruct, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[TMP1]], align 4
-; CHECK-NEXT:    ret i32 [[TMP2]]
-;
-  %1 = getelementptr inbounds i32, ptr @conststruct, i64 %idx
-  %2 = load i32, ptr %1, align 4
-  ret i32 %2
-}
-
-; can't be folded
-define i32 @gep_i8_load_i32_align1(i64 %idx){
-; CHECK-LABEL: @gep_i8_load_i32_align1(
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr @constarray, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[TMP1]], align 1
-; CHECK-NEXT:    ret i32 [[TMP2]]
-;
-  %1 = getelementptr inbounds i8, ptr @constarray, i64 %idx
-  %2 = load i32, ptr %1, align 1
-  ret i32 %2
-}
-
-; can't be folded
-define i32 @gep_i8_load_i32_align1_struct(i64 %idx){
-; CHECK-LABEL: @gep_i8_load_i32_align1_struct(
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i8, ptr @conststruct, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[TMP1]], align 1
-; CHECK-NEXT:    ret i32 [[TMP2]]
-;
-  %1 = getelementptr inbounds i8, ptr @conststruct, i64 %idx
-  %2 = load i32, ptr %1, align 1
-  ret i32 %2
-}
-; TODO: This could be folded but need to see GEP source types
-define i32 @gep_i16_load_i32_align1(i64 %idx){
-; CHECK-LABEL: @gep_i16_load_i32_align1(
-; CHECK-NEXT:    [[TMP1:%.*]] = getelementptr inbounds i16, ptr @constarray, i64 [[IDX:%.*]]
-; CHECK-NEXT:    [[TMP2:%.*]] = load i32, ptr [[TMP1]], align 1
-; CHECK-NEXT:    ret i32 [[TMP2]]
-;
-  %1 = getelementptr inbounds i16, ptr @constarray, i64 %idx
-  %2 = load i32, ptr %1, align 1
-  ret i32 %2
-}

diff  --git a/llvm/test/Transforms/InstSimplify/load.ll b/llvm/test/Transforms/InstSimplify/load.ll
index 2e2b1b14ddd0f..21a6452960adb 100644
--- a/llvm/test/Transforms/InstSimplify/load.ll
+++ b/llvm/test/Transforms/InstSimplify/load.ll
@@ -4,6 +4,11 @@
 @zeroinit = constant {} zeroinitializer
 @poison = constant {} poison
 
+ at constzeroarray = internal constant [4 x i32] zeroinitializer
+
+ at constarray = internal constant [4 x i32] [i32 1, i32 1, i32 1, i32 1]
+ at constarrayi8 = internal constant [2 x i8] [i8 1, i8 1]
+
 define i32 @crash_on_zeroinit() {
 ; CHECK-LABEL: @crash_on_zeroinit(
 ; CHECK-NEXT:    ret i32 poison
@@ -40,3 +45,46 @@ define <3 x float> @load_vec3() {
   %1 = load <3 x float>, ptr getelementptr inbounds (<3 x float>, ptr @constvec, i64 1)
   ret <3 x float> %1
 }
+
+define i32 @load_gep_const_zero_array(i64 %idx) {
+; CHECK-LABEL: @load_gep_const_zero_array(
+; CHECK-NEXT:    ret i32 0
+;
+  %gep = getelementptr inbounds [4 x i32], ptr @constzeroarray, i64 0, i64 %idx
+  %load = load i32, ptr %gep
+  ret i32 %load
+}
+
+define i8 @load_i8_multi_gep_const_zero_array(i64 %idx1, i64 %idx2) {
+; CHECK-LABEL: @load_i8_multi_gep_const_zero_array(
+; CHECK-NEXT:    ret i8 0
+;
+  %gep1 = getelementptr inbounds i8, ptr @constzeroarray, i64 %idx1
+  %gep = getelementptr inbounds i8, ptr %gep1, i64 %idx2
+  %load = load i8, ptr %gep
+  ret i8 %load
+}
+
+define i32 @load_gep_const_array(i64 %idx) {
+; CHECK-LABEL: @load_gep_const_array(
+; CHECK-NEXT:    [[GEP:%.*]] = getelementptr inbounds [4 x i32], ptr @constarray, i64 0, i64 [[IDX:%.*]]
+; CHECK-NEXT:    [[LOAD:%.*]] = load i32, ptr [[GEP]], align 4
+; CHECK-NEXT:    ret i32 [[LOAD]]
+;
+  %gep = getelementptr inbounds [4 x i32], ptr @constarray, i64 0, i64 %idx
+  %load = load i32, ptr %gep
+  ret i32 %load
+}
+
+define i8 @load_i8_multi_gep_const_array(i64 %idx1, i64 %idx2) {
+; CHECK-LABEL: @load_i8_multi_gep_const_array(
+; CHECK-NEXT:    [[GEP1:%.*]] = getelementptr inbounds i8, ptr @constarrayi8, i64 [[IDX1:%.*]]
+; CHECK-NEXT:    [[GEP:%.*]] = getelementptr inbounds i8, ptr [[GEP1]], i64 [[IDX2:%.*]]
+; CHECK-NEXT:    [[LOAD:%.*]] = load i8, ptr [[GEP]], align 1
+; CHECK-NEXT:    ret i8 [[LOAD]]
+;
+  %gep1 = getelementptr inbounds i8, ptr @constarrayi8, i64 %idx1
+  %gep = getelementptr inbounds i8, ptr %gep1, i64 %idx2
+  %load = load i8, ptr %gep
+  ret i8 %load
+}


        


More information about the llvm-commits mailing list