From a4cde9ad7b6f1a4cfef228f6cf2fc4911bf24c77 Mon Sep 17 00:00:00 2001 From: Tyker Date: Sun, 8 Mar 2020 12:19:29 +0100 Subject: [PATCH] Fixed [AssumeBundles] Move to IR so it can be used by Analysis This is a recommit of 57c964aaa76bfaa908398fbd9d8c9d6d19856859 after fixing modules build. --- llvm/include/llvm/{Transforms/Utils => IR}/KnowledgeRetention.h | 0 llvm/include/llvm/module.modulemap | 1 + llvm/lib/IR/CMakeLists.txt | 1 + llvm/lib/{Transforms/Utils => IR}/KnowledgeRetention.cpp | 2 +- llvm/lib/Passes/PassBuilder.cpp | 2 +- llvm/lib/Transforms/Utils/CMakeLists.txt | 1 - llvm/test/{Transforms/Util => IR}/assume-builder.ll | 0 llvm/unittests/IR/CMakeLists.txt | 1 + .../{Transforms/Utils => IR}/KnowledgeRetentionTest.cpp | 2 +- llvm/unittests/Transforms/Utils/CMakeLists.txt | 1 - 10 files changed, 6 insertions(+), 5 deletions(-) rename llvm/include/llvm/{Transforms/Utils => IR}/KnowledgeRetention.h (100%) rename llvm/lib/{Transforms/Utils => IR}/KnowledgeRetention.cpp (99%) rename llvm/test/{Transforms/Util => IR}/assume-builder.ll (100%) rename llvm/unittests/{Transforms/Utils => IR}/KnowledgeRetentionTest.cpp (99%) 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 87986c811fda6..c099b78b169cd 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 8fcc10fa38af3..14207bce57694 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 963bd22ee006b..7be93659196b8 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 a6a2a78f1c742..32d0a380ae3ab 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 24a5202c9f3d2..56e5071b2e3f3 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 3ef7cee98dcda..9dba01db1d11d 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 ed37e9c76858a..46f8c9346d6b7 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 9b0d7f0f08446..c9c0f9f841651 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