[PATCH] D82590: [NewPM][LoopUnrollAndJam] Rename unroll-and-jam to loop-unroll-and-jam

[Arthur Eubanks via Phabricator via llvm-commits]

aeubanks created this revision.
Herald added subscribers: llvm-commits, zzheng, hiraditya.
Herald added a project: LLVM.
aeubanks added a reviewer: Whitney.

The legacy pass is called "loop-unroll-and-jam", but in the new PM it's
called "unroll-and-jam".

Fixes some tests in llvm/test/Transforms/LoopUnrollAndJam when NPM is
turned on.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D82590

Files:
  llvm/lib/Passes/PassRegistry.def
  llvm/test/Transforms/LoopUnrollAndJam/dependencies.ll
  llvm/test/Transforms/LoopUnrollAndJam/dependencies_multidims.ll
  llvm/test/Transforms/LoopUnrollAndJam/disable.ll
  llvm/test/Transforms/LoopUnrollAndJam/innerloop.ll
  llvm/test/Transforms/LoopUnrollAndJam/pragma-explicit.ll
  llvm/test/Transforms/LoopUnrollAndJam/unroll-and-jam.ll


Index: llvm/test/Transforms/LoopUnrollAndJam/unroll-and-jam.ll
===================================================================
--- llvm/test/Transforms/LoopUnrollAndJam/unroll-and-jam.ll
+++ llvm/test/Transforms/LoopUnrollAndJam/unroll-and-jam.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt -basicaa -tbaa -loop-unroll-and-jam -allow-unroll-and-jam -unroll-and-jam-count=4 -unroll-remainder < %s -S | FileCheck %s
-; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 -unroll-remainder < %s -S | FileCheck %s
+; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='loop-unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 -unroll-remainder < %s -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 
Index: llvm/test/Transforms/LoopUnrollAndJam/pragma-explicit.ll
===================================================================
--- llvm/test/Transforms/LoopUnrollAndJam/pragma-explicit.ll
+++ llvm/test/Transforms/LoopUnrollAndJam/pragma-explicit.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -loop-unroll-and-jam -allow-unroll-and-jam -unroll-runtime -unroll-partial-threshold=60 < %s -S | FileCheck %s
-; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='unroll-and-jam' -allow-unroll-and-jam -unroll-runtime -unroll-partial-threshold=60 < %s -S | FileCheck %s
+; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='loop-unroll-and-jam' -allow-unroll-and-jam -unroll-runtime -unroll-partial-threshold=60 < %s -S | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
Index: llvm/test/Transforms/LoopUnrollAndJam/innerloop.ll
===================================================================
--- llvm/test/Transforms/LoopUnrollAndJam/innerloop.ll
+++ llvm/test/Transforms/LoopUnrollAndJam/innerloop.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -loop-unroll-and-jam -allow-unroll-and-jam -verify-loop-info < %s -S | FileCheck %s
-; RUN: opt -passes='unroll-and-jam,verify<loops>' -allow-unroll-and-jam < %s -S | FileCheck %s
+; RUN: opt -passes='loop-unroll-and-jam,verify<loops>' -allow-unroll-and-jam < %s -S | FileCheck %s
 
 ; Check that the newly created loops to not fail to be added to LI
 ; This test deliberately disables UnJ on the middle loop, performing it instead on the
Index: llvm/test/Transforms/LoopUnrollAndJam/disable.ll
===================================================================
--- llvm/test/Transforms/LoopUnrollAndJam/disable.ll
+++ llvm/test/Transforms/LoopUnrollAndJam/disable.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -loop-unroll-and-jam -allow-unroll-and-jam -unroll-and-jam-count=4 -pass-remarks=loop-unroll-and-jam < %s -S 2>&1 | FileCheck %s
-; RUN: opt -passes='unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 -pass-remarks=loop-unroll-and-jam < %s -S 2>&1 | FileCheck %s
+; RUN: opt -passes='loop-unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 -pass-remarks=loop-unroll-and-jam < %s -S 2>&1 | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 
Index: llvm/test/Transforms/LoopUnrollAndJam/dependencies_multidims.ll
===================================================================
--- llvm/test/Transforms/LoopUnrollAndJam/dependencies_multidims.ll
+++ llvm/test/Transforms/LoopUnrollAndJam/dependencies_multidims.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -da-disable-delinearization-checks -basicaa -loop-unroll-and-jam -allow-unroll-and-jam -unroll-and-jam-count=4 < %s -S | FileCheck %s
-; RUN: opt -da-disable-delinearization-checks -aa-pipeline=basic-aa -passes='unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 < %s -S | FileCheck %s
+; RUN: opt -da-disable-delinearization-checks -aa-pipeline=basic-aa -passes='loop-unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 < %s -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 
Index: llvm/test/Transforms/LoopUnrollAndJam/dependencies.ll
===================================================================
--- llvm/test/Transforms/LoopUnrollAndJam/dependencies.ll
+++ llvm/test/Transforms/LoopUnrollAndJam/dependencies.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -basicaa -loop-unroll-and-jam -allow-unroll-and-jam -unroll-and-jam-count=4 < %s -S | FileCheck %s
-; RUN: opt -aa-pipeline=basic-aa -passes='unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 < %s -S | FileCheck %s
+; RUN: opt -aa-pipeline=basic-aa -passes='loop-unroll-and-jam' -allow-unroll-and-jam -unroll-and-jam-count=4 < %s -S | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
 
Index: llvm/lib/Passes/PassRegistry.def
===================================================================
--- llvm/lib/Passes/PassRegistry.def
+++ llvm/lib/Passes/PassRegistry.def
@@ -209,6 +209,7 @@
 FUNCTION_PASS("load-store-vectorizer", LoadStoreVectorizerPass())
 FUNCTION_PASS("loop-simplify", LoopSimplifyPass())
 FUNCTION_PASS("loop-sink", LoopSinkPass())
+FUNCTION_PASS("loop-unroll-and-jam", LoopUnrollAndJamPass())
 FUNCTION_PASS("lowerinvoke", LowerInvokePass())
 FUNCTION_PASS("mem2reg", PromotePass())
 FUNCTION_PASS("memcpyopt", MemCpyOptPass())
@@ -249,7 +250,6 @@
 FUNCTION_PASS("spec-phis", SpeculateAroundPHIsPass())
 FUNCTION_PASS("sroa", SROA())
 FUNCTION_PASS("tailcallelim", TailCallElimPass())
-FUNCTION_PASS("unroll-and-jam", LoopUnrollAndJamPass())
 FUNCTION_PASS("vector-combine", VectorCombinePass())
 FUNCTION_PASS("verify", VerifierPass())
 FUNCTION_PASS("verify<domtree>", DominatorTreeVerifierPass())


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D82590.273472.patch
Type: text/x-patch
Size: 5653 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200625/70a8283c/attachment.bin>