fixup! Update with the latest metadata

Author: mshockwave

llvm/lib/Transforms/Vectorize/EVLIndVarSimplify.cpp

@@ -16,6 +16,7 @@
 #include "llvm/Analysis/IVDescriptors.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/LoopPass.h"
+#include "llvm/Analysis/OptimizationRemarkEmitter.h"
 #include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
 #include "llvm/Analysis/ValueTracking.h"
@@ -28,6 +29,7 @@
 #include "llvm/Transforms/Scalar/LoopPassManager.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Transforms/Utils/ScalarEvolutionExpander.h"
+#include "llvm/Transforms/Vectorize/LoopVectorizationLegality.h"
 
 #define DEBUG_TYPE "evl-iv-simplify"
 
@@ -97,8 +99,9 @@ bool EVLIndVarSimplifyImpl::run(Loop &L) {
   if (!EnableEVLIndVarSimplify)
     return false;
 
-  if (!getBooleanLoopAttribute(&L, "llvm.loop.isvectorized") ||
-      !getBooleanLoopAttribute(&L, "llvm.loop.isvectorized.withevl"))
+  OptimizationRemarkEmitter ORE(L.getHeader()->getParent());
+  const LoopVectorizeHints Hints(&L, true, ORE);
+  if (!Hints.isEVLVectorized())
     return false;
 
   BasicBlock *LatchBlock = L.getLoopLatch();

llvm/test/Transforms/LoopVectorize/evl-iv-simplify.ll

@@ -317,17 +317,17 @@ attributes #0 = { vscale_range(8,8) }
 !1 = !{!"llvm.loop.isvectorized", i32 1}
 !2 = !{!"llvm.loop.unroll.runtime.disable"}
 !3 = distinct !{!3, !2, !1, !4}
-!4 = !{!"llvm.loop.isvectorized.withevl", i32 1}
+!4 = !{!"llvm.loop.isvectorized.tailfoldingstyle", i32 0}
 ;.
 ; CHECK: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]], [[META3:![0-9]+]]}
 ; CHECK: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
 ; CHECK: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
-; CHECK: [[META3]] = !{!"llvm.loop.isvectorized.withevl", i32 1}
+; CHECK: [[META3]] = !{!"llvm.loop.isvectorized.tailfoldingstyle", i32 0}
 ; CHECK: [[LOOP4]] = distinct !{[[LOOP4]], [[META2]], [[META1]], [[META3]]}
 ;.
 ; LOOP-DEL: [[LOOP0]] = distinct !{[[LOOP0]], [[META1:![0-9]+]], [[META2:![0-9]+]], [[META3:![0-9]+]]}
 ; LOOP-DEL: [[META1]] = !{!"llvm.loop.isvectorized", i32 1}
 ; LOOP-DEL: [[META2]] = !{!"llvm.loop.unroll.runtime.disable"}
-; LOOP-DEL: [[META3]] = !{!"llvm.loop.isvectorized.withevl", i32 1}
+; LOOP-DEL: [[META3]] = !{!"llvm.loop.isvectorized.tailfoldingstyle", i32 0}
 ; LOOP-DEL: [[LOOP4]] = distinct !{[[LOOP4]], [[META2]], [[META1]], [[META3]]}
 ;.