[llvm] a4cde9a - Fixed [AssumeBundles] Move to IR so it can be used by Analysis

[via llvm-commits]

Author: Tyker
Date: 2020-03-10T18:02:39+01:00
New Revision: a4cde9ad7b6f1a4cfef228f6cf2fc4911bf24c77

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

LOG: Fixed [AssumeBundles] Move to IR so it can be used by Analysis

This is a recommit of 57c964aaa76bfaa908398fbd9d8c9d6d19856859
after fixing modules build.

Added: 
    llvm/include/llvm/IR/KnowledgeRetention.h
    llvm/lib/IR/KnowledgeRetention.cpp
    llvm/test/IR/assume-builder.ll
    llvm/unittests/IR/KnowledgeRetentionTest.cpp

Modified: 
    llvm/include/llvm/module.modulemap
    llvm/lib/IR/CMakeLists.txt
    llvm/lib/Passes/PassBuilder.cpp
    llvm/lib/Transforms/Utils/CMakeLists.txt
    llvm/unittests/IR/CMakeLists.txt
    llvm/unittests/Transforms/Utils/CMakeLists.txt

Removed: 
    llvm/include/llvm/Transforms/Utils/KnowledgeRetention.h
    llvm/lib/Transforms/Utils/KnowledgeRetention.cpp
    llvm/test/Transforms/Util/assume-builder.ll
    llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp


################################################################################
diff  --git a/llvm/include/llvm/Transforms/Utils/KnowledgeRetention.h b/llvm/include/llvm/IR/KnowledgeRetention.h
similarity index 100%
rename from llvm/include/llvm/Transforms/Utils/KnowledgeRetention.h
rename to llvm/include/llvm/IR/KnowledgeRetention.h

diff  --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index 87986c811fda..c099b78b169c 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/include/llvm/module.modulemap
@@ -273,6 +273,7 @@ module LLVM_intrinsic_gen {
   module IR_PatternMatch { header "IR/PatternMatch.h" export * }
   module IR_SafepointIRVerifier { header "IR/SafepointIRVerifier.h" export * }
   module IR_Statepoint { header "IR/Statepoint.h" export * }
+  module IR_KnowledgeRetention { header "IR/KnowledgeRetention.h" export * }
 
   export *
 }

diff  --git a/llvm/lib/IR/CMakeLists.txt b/llvm/lib/IR/CMakeLists.txt
index 8fcc10fa38af..14207bce5769 100644
--- a/llvm/lib/IR/CMakeLists.txt
+++ b/llvm/lib/IR/CMakeLists.txt
@@ -28,6 +28,7 @@ add_llvm_component_library(LLVMCore
   Instruction.cpp
   Instructions.cpp
   IntrinsicInst.cpp
+  KnowledgeRetention.cpp
   LLVMContext.cpp
   LLVMContextImpl.cpp
   LLVMRemarkStreamer.cpp

diff  --git a/llvm/lib/Transforms/Utils/KnowledgeRetention.cpp b/llvm/lib/IR/KnowledgeRetention.cpp
similarity index 99%
rename from llvm/lib/Transforms/Utils/KnowledgeRetention.cpp
rename to llvm/lib/IR/KnowledgeRetention.cpp
index 963bd22ee006..7be93659196b 100644
--- a/llvm/lib/Transforms/Utils/KnowledgeRetention.cpp
+++ b/llvm/lib/IR/KnowledgeRetention.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Utils/KnowledgeRetention.h"
+#include "llvm/IR/KnowledgeRetention.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/IntrinsicInst.h"

diff  --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index a6a2a78f1c74..32d0a380ae3a 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -59,6 +59,7 @@
 #include "llvm/CodeGen/UnreachableBlockElim.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/IRPrintingPasses.h"
+#include "llvm/IR/KnowledgeRetention.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/IR/SafepointIRVerifier.h"
 #include "llvm/IR/Verifier.h"
@@ -179,7 +180,6 @@
 #include "llvm/Transforms/Utils/CanonicalizeAliases.h"
 #include "llvm/Transforms/Utils/EntryExitInstrumenter.h"
 #include "llvm/Transforms/Utils/InjectTLIMappings.h"
-#include "llvm/Transforms/Utils/KnowledgeRetention.h"
 #include "llvm/Transforms/Utils/LCSSA.h"
 #include "llvm/Transforms/Utils/LibCallsShrinkWrap.h"
 #include "llvm/Transforms/Utils/LoopSimplify.h"

diff  --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt
index 24a5202c9f3d..56e5071b2e3f 100644
--- a/llvm/lib/Transforms/Utils/CMakeLists.txt
+++ b/llvm/lib/Transforms/Utils/CMakeLists.txt
@@ -29,7 +29,6 @@ add_llvm_component_library(LLVMTransformUtils
   InjectTLIMappings.cpp
   InstructionNamer.cpp
   IntegerDivision.cpp
-  KnowledgeRetention.cpp
   LCSSA.cpp
   LibCallsShrinkWrap.cpp
   Local.cpp

diff  --git a/llvm/test/Transforms/Util/assume-builder.ll b/llvm/test/IR/assume-builder.ll
similarity index 100%
rename from llvm/test/Transforms/Util/assume-builder.ll
rename to llvm/test/IR/assume-builder.ll

diff  --git a/llvm/unittests/IR/CMakeLists.txt b/llvm/unittests/IR/CMakeLists.txt
index 3ef7cee98dcd..9dba01db1d11 100644
--- a/llvm/unittests/IR/CMakeLists.txt
+++ b/llvm/unittests/IR/CMakeLists.txt
@@ -24,6 +24,7 @@ add_llvm_unittest(IRTests
   IRBuilderTest.cpp
   InstructionsTest.cpp
   IntrinsicsTest.cpp
+  KnowledgeRetentionTest.cpp
   LegacyPassManagerTest.cpp
   MDBuilderTest.cpp
   ManglerTest.cpp

diff  --git a/llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp b/llvm/unittests/IR/KnowledgeRetentionTest.cpp
similarity index 99%
rename from llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp
rename to llvm/unittests/IR/KnowledgeRetentionTest.cpp
index ed37e9c76858..46f8c9346d6b 100644
--- a/llvm/unittests/Transforms/Utils/KnowledgeRetentionTest.cpp
+++ b/llvm/unittests/IR/KnowledgeRetentionTest.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Utils/KnowledgeRetention.h"
+#include "llvm/IR/KnowledgeRetention.h"
 #include "llvm/AsmParser/Parser.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/LLVMContext.h"

diff  --git a/llvm/unittests/Transforms/Utils/CMakeLists.txt b/llvm/unittests/Transforms/Utils/CMakeLists.txt
index 9b0d7f0f0844..c9c0f9f84165 100644
--- a/llvm/unittests/Transforms/Utils/CMakeLists.txt
+++ b/llvm/unittests/Transforms/Utils/CMakeLists.txt
@@ -15,7 +15,6 @@ add_llvm_unittest(UtilsTests
   CodeMoverUtilsTest.cpp
   FunctionComparatorTest.cpp
   IntegerDivisionTest.cpp
-  KnowledgeRetentionTest.cpp
   LocalTest.cpp
   LoopRotationUtilsTest.cpp
   LoopUtilsTest.cpp