[ConstProp] Remove ConstantPropagation

As discussed in
http://lists.llvm.org/pipermail/llvm-dev/2020-July/143801.html.

Currently no users outside of unit tests.

Replace all instances in tests of -constprop with -instsimplify.
Notable changes in tests:
* vscale.ll - @llvm.sadd.sat.nxv16i8 is evaluated by instsimplify, use a fake intrinsic instead
* InsertElement.ll - insertelement undef is removed by instsimplify in @insertelement_undef
llvm/test/Transforms/ConstProp moved to llvm/test/Transforms/InstSimplify/ConstProp

Reviewed By: lattner, nikic

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

Author: aeubanks

llvm/bindings/go/llvm/executionengine_test.go

@@ -80,7 +80,6 @@ func TestFactorial(t *testing.T) {
 	pass := NewPassManager()
 	defer pass.Dispose()
 
-	pass.AddConstantPropagationPass()
 	pass.AddInstructionCombiningPass()
 	pass.AddPromoteMemoryToRegisterPass()
 	pass.AddGVNPass()

llvm/bindings/go/llvm/transforms_scalar.go

@@ -40,6 +40,5 @@ func (pm PassManager) AddScalarReplAggregatesPassWithThreshold(threshold int) {
 }
 func (pm PassManager) AddSimplifyLibCallsPass()       { C.LLVMAddSimplifyLibCallsPass(pm.C) }
 func (pm PassManager) AddTailCallEliminationPass()    { C.LLVMAddTailCallEliminationPass(pm.C) }
-func (pm PassManager) AddConstantPropagationPass()    { C.LLVMAddConstantPropagationPass(pm.C) }
 func (pm PassManager) AddDemoteMemoryToRegisterPass() { C.LLVMAddDemoteMemoryToRegisterPass(pm.C) }
 func (pm PassManager) AddVerifierPass()               { C.LLVMAddVerifierPass(pm.C) }

llvm/bindings/ocaml/transforms/scalar_opts/llvm_scalar_opts.mli

@@ -161,11 +161,6 @@ external add_tail_call_elimination
   : [< Llvm.PassManager.any ] Llvm.PassManager.t -> unit
   = "llvm_add_tail_call_elimination"
 
-(** See the [llvm::createConstantPropagationPass] function. *)
-external add_constant_propagation
-  : [< Llvm.PassManager.any ] Llvm.PassManager.t -> unit
-  = "llvm_add_constant_propagation"
-
 (** See the [llvm::createDemoteMemoryToRegisterPass] function. *)
 external add_memory_to_register_demotion
   : [< Llvm.PassManager.any ] Llvm.PassManager.t -> unit

llvm/bindings/ocaml/transforms/scalar_opts/scalar_opts_ocaml.c

@@ -200,12 +200,6 @@ CAMLprim value llvm_add_tail_call_elimination(LLVMPassManagerRef PM) {
   return Val_unit;
 }
 
-/* [<Llvm.PassManager.any] Llvm.PassManager.t -> unit */
-CAMLprim value llvm_add_constant_propagation(LLVMPassManagerRef PM) {
-  LLVMAddConstantPropagationPass(PM);
-  return Val_unit;
-}
-
 /* [<Llvm.PassManager.any] Llvm.PassManager.t -> unit */
 CAMLprim value llvm_add_demote_memory_to_register(LLVMPassManagerRef PM) {
   LLVMAddDemoteMemoryToRegisterPass(PM);

llvm/docs/CommandLine.rst

@@ -475,7 +475,7 @@ Parsing a list of options
 Now that we have the standard run-of-the-mill argument types out of the way,
 lets get a little wild and crazy.  Lets say that we want our optimizer to accept
 a **list** of optimizations to perform, allowing duplicates.  For example, we
-might want to run: "``compiler -dce -constprop -inline -dce -strip``".  In this
+might want to run: "``compiler -dce -instsimplify -inline -dce -strip``".  In this
 case, the order of the arguments and the number of appearances is very
 important.  This is what the "``cl::list``" template is for.  First, start by
 defining an enum of the optimizations that you would like to perform:
@@ -484,7 +484,7 @@ defining an enum of the optimizations that you would like to perform:
 
   enum Opts {
     // 'inline' is a C++ keyword, so name it 'inlining'
-    dce, constprop, inlining, strip
+    dce, instsimplify, inlining, strip
   };
 
 Then define your "``cl::list``" variable:
@@ -494,7 +494,7 @@ Then define your "``cl::list``" variable:
   cl::list<Opts> OptimizationList(cl::desc("Available Optimizations:"),
     cl::values(
       clEnumVal(dce               , "Dead Code Elimination"),
-      clEnumVal(constprop         , "Constant Propagation"),
+      clEnumVal(instsimplify      , "Instruction Simplification"),
      clEnumValN(inlining, "inline", "Procedure Integration"),
       clEnumVal(strip             , "Strip Symbols")));
 
@@ -553,16 +553,16 @@ Reworking the above list example, we could replace `cl::list`_ with `cl::bits`_:
   cl::bits<Opts> OptimizationBits(cl::desc("Available Optimizations:"),
     cl::values(
       clEnumVal(dce               , "Dead Code Elimination"),
-      clEnumVal(constprop         , "Constant Propagation"),
+      clEnumVal(instsimplify      , "Instruction Simplification"),
      clEnumValN(inlining, "inline", "Procedure Integration"),
       clEnumVal(strip             , "Strip Symbols")));
 
-To test to see if ``constprop`` was specified, we can use the ``cl:bits::isSet``
+To test to see if ``instsimplify`` was specified, we can use the ``cl:bits::isSet``
 function:
 
 .. code-block:: c++
 
-  if (OptimizationBits.isSet(constprop)) {
+  if (OptimizationBits.isSet(instsimplify)) {
     ...
   }
 

llvm/docs/Passes.rst

@@ -460,27 +460,6 @@ shared.  This is useful because some passes (i.e., TraceValues) insert a lot of
 string constants into the program, regardless of whether or not an existing
 string is available.
 
-``-constprop``: Simple constant propagation
--------------------------------------------
-
-This pass implements constant propagation and merging.  It looks for
-instructions involving only constant operands and replaces them with a constant
-value instead of an instruction.  For example:
-
-.. code-block:: llvm
-
-  add i32 1, 2
-
-becomes
-
-.. code-block:: llvm
-
-  i32 3
-
-NOTE: this pass has a habit of making definitions be dead.  It is a good idea
-to run a :ref:`Dead Instruction Elimination <passes-die>` pass sometime after
-running this pass.
-
 .. _passes-dce:
 
 ``-dce``: Dead Code Elimination

llvm/include/llvm-c/Transforms/Scalar.h

@@ -125,9 +125,6 @@ void LLVMAddSimplifyLibCallsPass(LLVMPassManagerRef PM);
 /** See llvm::createTailCallEliminationPass function. */
 void LLVMAddTailCallEliminationPass(LLVMPassManagerRef PM);
 
-/** See llvm::createConstantPropagationPass function. */
-void LLVMAddConstantPropagationPass(LLVMPassManagerRef PM);
-
 /** See llvm::demotePromoteMemoryToRegisterPass function. */
 void LLVMAddDemoteMemoryToRegisterPass(LLVMPassManagerRef PM);
 

llvm/include/llvm/InitializePasses.h

@@ -113,7 +113,6 @@ void initializeCalledValuePropagationLegacyPassPass(PassRegistry &);
 void initializeCodeGenPreparePass(PassRegistry&);
 void initializeConstantHoistingLegacyPassPass(PassRegistry&);
 void initializeConstantMergeLegacyPassPass(PassRegistry&);
-void initializeConstantPropagationPass(PassRegistry&);
 void initializeControlHeightReductionLegacyPassPass(PassRegistry&);
 void initializeCorrelatedValuePropagationPass(PassRegistry&);
 void initializeCostModelAnalysisPass(PassRegistry&);

llvm/include/llvm/LinkAllPasses.h

@@ -89,7 +89,6 @@ namespace {
       (void) llvm::createLibCallsShrinkWrapPass();
       (void) llvm::createCalledValuePropagationPass();
       (void) llvm::createConstantMergePass();
-      (void) llvm::createConstantPropagationPass();
       (void) llvm::createControlHeightReductionLegacyPass();
       (void) llvm::createCostModelAnalysisPass();
       (void) llvm::createDeadArgEliminationPass();

llvm/include/llvm/Transforms/Scalar.h

@@ -24,12 +24,6 @@ class FunctionPass;
 class ModulePass;
 class Pass;
 
-//===----------------------------------------------------------------------===//
-//
-// ConstantPropagation - A worklist driven constant propagation pass
-//
-FunctionPass *createConstantPropagationPass();
-
 //===----------------------------------------------------------------------===//
 //
 // AlignmentFromAssumptions - Use assume intrinsics to set load/store

llvm/lib/Transforms/Scalar/CMakeLists.txt

@@ -4,7 +4,6 @@ add_llvm_component_library(LLVMScalarOpts
   BDCE.cpp
   CallSiteSplitting.cpp
   ConstantHoisting.cpp
-  ConstantProp.cpp
   CorrelatedValuePropagation.cpp
   DCE.cpp
   DeadStoreElimination.cpp

llvm/lib/Transforms/Scalar/ConstantProp.cpp

@@ -38,7 +38,6 @@ void llvm::initializeScalarOpts(PassRegistry &Registry) {
   initializeAlignmentFromAssumptionsPass(Registry);
   initializeCallSiteSplittingLegacyPassPass(Registry);
   initializeConstantHoistingLegacyPassPass(Registry);
-  initializeConstantPropagationPass(Registry);
   initializeCorrelatedValuePropagationPass(Registry);
   initializeDCELegacyPassPass(Registry);
   initializeDeadInstEliminationPass(Registry);
@@ -248,10 +247,6 @@ void LLVMAddTailCallEliminationPass(LLVMPassManagerRef PM) {
   unwrap(PM)->add(createTailCallEliminationPass());
 }
 
-void LLVMAddConstantPropagationPass(LLVMPassManagerRef PM) {
-  unwrap(PM)->add(createConstantPropagationPass());
-}
-
 void LLVMAddDemoteMemoryToRegisterPass(LLVMPassManagerRef PM) {
   unwrap(PM)->add(createDemoteRegisterToMemoryPass());
 }

llvm/lib/Transforms/Scalar/Scalar.cpp

@@ -5,8 +5,8 @@
 ; of the bug that was causing the Olden Health benchmark to output incorrect
 ; results!
 ;
-; RUN: opt -constprop -S > %t.1 < %s
-; RUN: llvm-as < %s | llvm-dis | llvm-as | opt -constprop | \
+; RUN: opt -instsimplify -S > %t.1 < %s
+; RUN: llvm-as < %s | llvm-dis | llvm-as | opt -instsimplify | \
 ; RUN: llvm-dis > %t.2
 ; RUN: diff %t.1 %t.2
 ; RUN: verify-uselistorder %s

llvm/test/Assembler/2002-04-07-HexFloatConstants.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -constprop | llvm-dis -disable-output
+; RUN: opt < %s -instsimplify | llvm-dis -disable-output
 ; RUN: verify-uselistorder < %s
 ; PR3465
 

llvm/test/Bitcode/extractelement.ll

@@ -5,7 +5,7 @@
 ;
 ; Fixed by adding new arguments to ConstantFoldTerminator
 ;
-; RUN: opt < %s -constprop
+; RUN: opt < %s -instsimplify
 
 define void @build_tree(i32 %ml) {
 ; <label>:0

llvm/test/Other/2002-03-11-ConstPropCrash.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2002-03-11-ConstPropCrash.ll

@@ -1,6 +1,6 @@
 ; Make sure that the constant propogator doesn't divide by zero!
 ;
-; RUN: opt < %s -constprop
+; RUN: opt < %s -instsimplify
 ;
 
 define i32 @test() {

llvm/test/Transforms/ConstProp/2002-05-03-DivideByZeroException.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2002-05-03-DivideByZeroException.ll

@@ -4,7 +4,7 @@
 
 ; Fix #2: The unary not instruction now no longer exists. Change to xor.
 
-; RUN: opt < %s -constprop -S | \
+; RUN: opt < %s -instsimplify -S | \
 ; RUN:   not grep "i32 0"
 
 define i32 @test1() {

llvm/test/Transforms/ConstProp/2002-05-03-NotOperator.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2002-05-03-NotOperator.ll

@@ -1,6 +1,6 @@
 ; SetCC on boolean values was not implemented!
 
-; RUN: opt < %s -constprop -die -S | \
+; RUN: opt < %s -instsimplify -die -S | \
 ; RUN:   not grep set
 
 define i1 @test1() {

llvm/test/Transforms/ConstProp/2002-09-03-SetCC-Bools.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2002-09-03-SetCC-Bools.ll

@@ -1,6 +1,6 @@
 ; Make sure that the constant propagator doesn't cause a sigfpe
 ;
-; RUN: opt < %s -constprop
+; RUN: opt < %s -instsimplify
 ;
 
 define i32 @test() {

llvm/test/Transforms/ConstProp/2003-05-12-DivideError.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2003-05-12-DivideError.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -constprop -S | \
+; RUN: opt < %s -instsimplify -S | \
 ; RUN:    not grep "ret i1 false"
 
 @b = external global [2 x {  }]         ; <[2 x {  }]*> [#uses=2]

llvm/test/Transforms/ConstProp/2005-01-28-SetCCGEP.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2005-01-28-SetCCGEP.ll

@@ -1,6 +1,6 @@
-; RUN: opt < %s -constprop -S | \
+; RUN: opt < %s -instsimplify -S | \
 ; RUN:   grep "i32 -1"
-; RUN: opt < %s -constprop -S | \
+; RUN: opt < %s -instsimplify -S | \
 ; RUN:   not grep zeroinitializer
 
 define <4 x i32> @test() {

llvm/test/Transforms/ConstProp/2006-11-30-vector-cast.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2006-11-30-vector-cast.ll

@@ -1,6 +1,6 @@
-; RUN: opt < %s -constprop -S | \
+; RUN: opt < %s -instsimplify -S | \
 ; RUN:    grep "ret i32 -1"
-; RUN: opt < %s -constprop -S | \
+; RUN: opt < %s -instsimplify -S | \
 ; RUN:    grep "ret i32 1"
 
 define i32 @test1() {

llvm/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2006-12-01-TruncBoolBug.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -constprop -S | grep 1065353216
+; RUN: opt < %s -instsimplify -S | grep 1065353216
 
 define i32 @test() {
         %A = bitcast float 1.000000e+00 to i32          ; <i32> [#uses=1]

llvm/test/Transforms/ConstProp/2006-12-01-bool-casts.ll renamed to llvm/test/Transforms/InstSimplify/ConstProp/2006-12-01-bool-casts.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -constprop -disable-output
+; RUN: opt < %s -instsimplify -disable-output
 ; PR2529
 define <4 x i1> @test1(i32 %argc, i8** %argv) {
 entry: