[llvm] 30b0c45 - [LoopCacheAnalysis]: handle mismatch type for Numerator and CacheLineSize

[Jinsong Ji via llvm-commits]

Author: Zheng Chen
Date: 2021-08-06T16:51:09Z
New Revision: 30b0c455b150c9e29f2a4f500fa721dea82d5e37

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

LOG: [LoopCacheAnalysis]: handle mismatch type for Numerator and CacheLineSize

fix an assertion due to mismatch type for Numerator and CacheLineSize in loop cache analysis pass.

Reviewed By: bmahjour

Differential Revision: https://reviews.llvm.org/D107618

Added: 
    llvm/test/Analysis/LoopCacheAnalysis/PowerPC/compute-cost-m32.ll

Modified: 
    llvm/lib/Analysis/LoopCacheAnalysis.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Analysis/LoopCacheAnalysis.cpp b/llvm/lib/Analysis/LoopCacheAnalysis.cpp
index 8a613647bbea9..772e4eb239a9c 100644
--- a/llvm/lib/Analysis/LoopCacheAnalysis.cpp
+++ b/llvm/lib/Analysis/LoopCacheAnalysis.cpp
@@ -290,8 +290,8 @@ CacheCostTy IndexedReference::computeRefCost(const Loop &L,
     const SCEV *Coeff = getLastCoefficient();
     const SCEV *ElemSize = Sizes.back();
     const SCEV *Stride = SE.getMulExpr(Coeff, ElemSize);
-    const SCEV *CacheLineSize = SE.getConstant(Stride->getType(), CLS);
     Type *WiderType = SE.getWiderType(Stride->getType(), TripCount->getType());
+    const SCEV *CacheLineSize = SE.getConstant(WiderType, CLS);
     if (SE.isKnownNegative(Stride))
       Stride = SE.getNegativeSCEV(Stride);
     Stride = SE.getNoopOrAnyExtend(Stride, WiderType);

diff  --git a/llvm/test/Analysis/LoopCacheAnalysis/PowerPC/compute-cost-m32.ll b/llvm/test/Analysis/LoopCacheAnalysis/PowerPC/compute-cost-m32.ll
new file mode 100644
index 0000000000000..cf24705a17fb1
--- /dev/null
+++ b/llvm/test/Analysis/LoopCacheAnalysis/PowerPC/compute-cost-m32.ll
@@ -0,0 +1,28 @@
+; RUN: opt < %s -passes='print<loop-cache-cost>' -disable-output 2>&1 | FileCheck %s
+
+target datalayout = "E-m:a-i64:64-p:32:32-n32-S128-v256:256:256-v512:512:512"
+target triple = "powerpc-ibm-aix7.2.0.0"
+
+; Check IndexedReference::computeRefCost can handle type 
diff erences between
+; CacheLineSize and Numerator
+
+; CHECK: Loop '_loop_1_do_' has cost = 2
+
+%_elem_type_of_v = type <{ i32 }>
+
+define signext i32 @foo(%_elem_type_of_v* %v) {
+_entry:
+  br label %_loop_1_do_
+
+_loop_1_do_:                                      ; preds = %_entry, %_loop_1_do_
+  %i.011 = phi i64 [ 1, %_entry ], [ %_loop_1_update_loop_ix, %_loop_1_do_ ]
+  %_conv = trunc i64 %i.011 to i32
+  %_ind_cast = getelementptr %_elem_type_of_v, %_elem_type_of_v* %v, i32 %_conv, i32 0
+  store i32 %_conv, i32* %_ind_cast, align 4
+  %_loop_1_update_loop_ix = add nuw nsw i64 %i.011, 1
+  %_leq_tmp = icmp ult i64 %_loop_1_update_loop_ix, 33
+  br i1 %_leq_tmp, label %_loop_1_do_, label %_loop_1_endl_
+
+_loop_1_endl_:                                    ; preds = %_loop_1_do_
+  ret i32 0
+}