diff --git a/llvm/include/llvm/Analysis/ML/InlineFeaturesAnalysis.h b/llvm/include/llvm/Analysis/InlineFeaturesAnalysis.h rename from llvm/include/llvm/Analysis/ML/InlineFeaturesAnalysis.h rename to llvm/include/llvm/Analysis/InlineFeaturesAnalysis.h diff --git a/llvm/lib/Analysis/CMakeLists.txt b/llvm/lib/Analysis/CMakeLists.txt --- a/llvm/lib/Analysis/CMakeLists.txt +++ b/llvm/lib/Analysis/CMakeLists.txt @@ -1,5 +1,3 @@ -add_subdirectory(ML) - add_llvm_component_library(LLVMAnalysis AliasAnalysis.cpp AliasAnalysisEvaluator.cpp @@ -43,6 +41,7 @@ IndirectCallPromotionAnalysis.cpp InlineCost.cpp InlineAdvisor.cpp + InlineFeaturesAnalysis.cpp InstCount.cpp InstructionPrecedenceTracking.cpp InstructionSimplify.cpp diff --git a/llvm/lib/Analysis/ML/InlineFeaturesAnalysis.cpp b/llvm/lib/Analysis/InlineFeaturesAnalysis.cpp rename from llvm/lib/Analysis/ML/InlineFeaturesAnalysis.cpp rename to llvm/lib/Analysis/InlineFeaturesAnalysis.cpp --- a/llvm/lib/Analysis/ML/InlineFeaturesAnalysis.cpp +++ b/llvm/lib/Analysis/InlineFeaturesAnalysis.cpp @@ -1,4 +1,4 @@ -#include "llvm/Analysis/ML/InlineFeaturesAnalysis.h" +#include "llvm/Analysis/InlineFeaturesAnalysis.h" #include "llvm/IR/Instructions.h" using namespace llvm; diff --git a/llvm/lib/Analysis/LLVMBuild.txt b/llvm/lib/Analysis/LLVMBuild.txt --- a/llvm/lib/Analysis/LLVMBuild.txt +++ b/llvm/lib/Analysis/LLVMBuild.txt @@ -14,9 +14,6 @@ ; ;===------------------------------------------------------------------------===; -[common] -subdirectories = ML - [component_0] type = Library name = Analysis diff --git a/llvm/lib/Analysis/ML/CMakeLists.txt b/llvm/lib/Analysis/ML/CMakeLists.txt deleted file mode 100644 --- a/llvm/lib/Analysis/ML/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_llvm_component_library(LLVMMLPolicies - InlineFeaturesAnalysis.cpp - - DEPENDS - intrinsics_gen - ) diff --git a/llvm/lib/Analysis/ML/LLVMBuild.txt b/llvm/lib/Analysis/ML/LLVMBuild.txt deleted file mode 100644 --- a/llvm/lib/Analysis/ML/LLVMBuild.txt +++ /dev/null @@ -1,21 +0,0 @@ -;===- ./lib/Analysis/ML/LLVMBuild.txt --------------------------*- Conf -*--===; -; -; Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -; See https://llvm.org/LICENSE.txt for license information. -; SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -; -;===------------------------------------------------------------------------===; -; -; This is an LLVMBuild description file for the components in this subdirectory. -; -; For more information on the LLVMBuild system, please see: -; -; http://llvm.org/docs/LLVMBuild.html -; -;===------------------------------------------------------------------------===; - -[component_0] -type = Library -name = MLPolicies -parent = Analysis -required_libraries = Core Support diff --git a/llvm/lib/Passes/LLVMBuild.txt b/llvm/lib/Passes/LLVMBuild.txt --- a/llvm/lib/Passes/LLVMBuild.txt +++ b/llvm/lib/Passes/LLVMBuild.txt @@ -18,4 +18,4 @@ type = Library name = Passes parent = Libraries -required_libraries = AggressiveInstCombine Analysis MLPolicies CodeGen Core Coroutines IPO InstCombine Scalar Support Target TransformUtils Vectorize Instrumentation +required_libraries = AggressiveInstCombine Analysis CodeGen Core Coroutines IPO InstCombine Scalar Support Target TransformUtils Vectorize Instrumentation diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -34,13 +34,13 @@ #include "llvm/Analysis/GlobalsModRef.h" #include "llvm/Analysis/IVUsers.h" #include "llvm/Analysis/InlineAdvisor.h" +#include "llvm/Analysis/InlineFeaturesAnalysis.h" #include "llvm/Analysis/LazyCallGraph.h" #include "llvm/Analysis/LazyValueInfo.h" #include "llvm/Analysis/LoopAccessAnalysis.h" #include "llvm/Analysis/LoopCacheAnalysis.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/LoopNestAnalysis.h" -#include "llvm/Analysis/ML/InlineFeaturesAnalysis.h" #include "llvm/Analysis/MemoryDependenceAnalysis.h" #include "llvm/Analysis/MemorySSA.h" #include "llvm/Analysis/ModuleSummaryAnalysis.h" diff --git a/llvm/unittests/Analysis/CMakeLists.txt b/llvm/unittests/Analysis/CMakeLists.txt --- a/llvm/unittests/Analysis/CMakeLists.txt +++ b/llvm/unittests/Analysis/CMakeLists.txt @@ -21,6 +21,7 @@ DivergenceAnalysisTest.cpp DomTreeUpdaterTest.cpp GlobalsModRefTest.cpp + InlineFeaturesAnalysisTest.cpp IVDescriptorsTest.cpp LazyCallGraphTest.cpp LoadsTest.cpp @@ -40,6 +41,4 @@ ValueLatticeTest.cpp ValueTrackingTest.cpp VectorUtilsTest.cpp - ) - -add_subdirectory(ML) \ No newline at end of file + ) \ No newline at end of file diff --git a/llvm/unittests/Analysis/ML/InlineFeaturesAnalysisTest.cpp b/llvm/unittests/Analysis/InlineFeaturesAnalysisTest.cpp rename from llvm/unittests/Analysis/ML/InlineFeaturesAnalysisTest.cpp rename to llvm/unittests/Analysis/InlineFeaturesAnalysisTest.cpp --- a/llvm/unittests/Analysis/ML/InlineFeaturesAnalysisTest.cpp +++ b/llvm/unittests/Analysis/InlineFeaturesAnalysisTest.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Analysis/ML/InlineFeaturesAnalysis.h" +#include "llvm/Analysis/InlineFeaturesAnalysis.h" #include "llvm/AsmParser/Parser.h" #include "llvm/IR/Instructions.h" #include "llvm/IR/LLVMContext.h" diff --git a/llvm/unittests/Analysis/ML/CMakeLists.txt b/llvm/unittests/Analysis/ML/CMakeLists.txt deleted file mode 100644 --- a/llvm/unittests/Analysis/ML/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(LLVM_LINK_COMPONENTS - Analysis - AsmParser - Core - MLPolicies - Support - TransformUtils - ) - -add_llvm_unittest(MLAnalysisTests - InlineFeaturesAnalysisTest.cpp - )