!fixup Updated with the latest EVL-vectorized metadata

Author: mshockwave

llvm/lib/Transforms/Vectorize/EVLIndVarSimplify.cpp

@@ -97,8 +97,12 @@ bool EVLIndVarSimplifyImpl::run(Loop &L) {
   if (!EnableEVLIndVarSimplify)
     return false;
 
-  if (!getBooleanLoopAttribute(&L, "llvm.loop.isvectorized") ||
-      !getBooleanLoopAttribute(&L, "llvm.loop.isvectorized.withevl"))
+  if (!getBooleanLoopAttribute(&L, "llvm.loop.isvectorized"))
+    return false;
+  const MDOperand *EVLMD =
+      findStringMetadataForLoop(&L, "llvm.loop.isvectorized.tailfoldingstyle")
+          .value_or(nullptr);
+  if (!EVLMD || !EVLMD->equalsStr("evl"))
     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", !"evl"}
 ;.
 ; 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", !"evl"}
 ; 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", !"evl"}
 ; LOOP-DEL: [[LOOP4]] = distinct !{[[LOOP4]], [[META2]], [[META1]], [[META3]]}
 ;.