From 4fe1fe141871b388a87c1caeff8a824953a6bbb1 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Fri, 23 Mar 2018 22:11:06 +0000 Subject: [PATCH] Fix Layering, move instrumentation transform headers into Instrumentation subdirectory llvm-svn: 328379 --- llvm/include/llvm/Transforms/{ => Instrumentation}/GCOVProfiler.h | 2 +- llvm/include/llvm/Transforms/{ => Instrumentation}/InstrProfiling.h | 2 +- .../llvm/Transforms/{ => Instrumentation}/PGOInstrumentation.h | 2 +- llvm/lib/Passes/PassBuilder.cpp | 6 +++--- llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp | 2 +- llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp | 2 +- llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp | 2 +- llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp | 2 +- llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename llvm/include/llvm/Transforms/{ => Instrumentation}/GCOVProfiler.h (92%) rename llvm/include/llvm/Transforms/{ => Instrumentation}/InstrProfiling.h (98%) rename llvm/include/llvm/Transforms/{ => Instrumentation}/PGOInstrumentation.h (97%) diff --git a/llvm/include/llvm/Transforms/GCOVProfiler.h b/llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h similarity index 92% rename from llvm/include/llvm/Transforms/GCOVProfiler.h rename to llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h index 66bd75c..dd55fbe 100644 --- a/llvm/include/llvm/Transforms/GCOVProfiler.h +++ b/llvm/include/llvm/Transforms/Instrumentation/GCOVProfiler.h @@ -1,4 +1,4 @@ -//===- Transforms/GCOVProfiler.h - GCOVProfiler pass ----------*- C++ -*-===// +//===- Transforms/Instrumentation/GCOVProfiler.h ----------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // diff --git a/llvm/include/llvm/Transforms/InstrProfiling.h b/llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h similarity index 98% rename from llvm/include/llvm/Transforms/InstrProfiling.h rename to llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h index acb6968..13fb3db 100644 --- a/llvm/include/llvm/Transforms/InstrProfiling.h +++ b/llvm/include/llvm/Transforms/Instrumentation/InstrProfiling.h @@ -1,4 +1,4 @@ -//===- Transforms/InstrProfiling.h - Instrumentation passes -----*- C++ -*-===// +//===- Transforms/Instrumentation/InstrProfiling.h --------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // diff --git a/llvm/include/llvm/Transforms/PGOInstrumentation.h b/llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h similarity index 97% rename from llvm/include/llvm/Transforms/PGOInstrumentation.h rename to llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h index c2cc76c..c0b37c4 100644 --- a/llvm/include/llvm/Transforms/PGOInstrumentation.h +++ b/llvm/include/llvm/Transforms/Instrumentation/PGOInstrumentation.h @@ -1,4 +1,4 @@ -//===- Transforms/PGOInstrumentation.h - PGO gen/use passes -----*- C++ -*-===// +//===- Transforms/Instrumentation/PGOInstrumentation.h ----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index 69fa723..38f98ae 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -60,7 +60,7 @@ #include "llvm/Support/Regex.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h" -#include "llvm/Transforms/GCOVProfiler.h" +#include "llvm/Transforms/Instrumentation/GCOVProfiler.h" #include "llvm/Transforms/IPO/AlwaysInliner.h" #include "llvm/Transforms/IPO/ArgumentPromotion.h" #include "llvm/Transforms/IPO/CalledValuePropagation.h" @@ -85,9 +85,9 @@ #include "llvm/Transforms/IPO/SyntheticCountsPropagation.h" #include "llvm/Transforms/IPO/WholeProgramDevirt.h" #include "llvm/Transforms/InstCombine/InstCombine.h" -#include "llvm/Transforms/InstrProfiling.h" +#include "llvm/Transforms/Instrumentation/InstrProfiling.h" #include "llvm/Transforms/Instrumentation/BoundsChecking.h" -#include "llvm/Transforms/PGOInstrumentation.h" +#include "llvm/Transforms/Instrumentation/PGOInstrumentation.h" #include "llvm/Transforms/Scalar/ADCE.h" #include "llvm/Transforms/Scalar/AlignmentFromAssumptions.h" #include "llvm/Transforms/Scalar/BDCE.h" diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp index 67ca817..68b4d32 100644 --- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -35,7 +35,7 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Transforms/GCOVProfiler.h" +#include "llvm/Transforms/Instrumentation/GCOVProfiler.h" #include "llvm/Transforms/Instrumentation.h" #include "llvm/Transforms/Utils/ModuleUtils.h" #include diff --git a/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp b/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp index 49b8a67..ec035c8 100644 --- a/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp +++ b/llvm/lib/Transforms/Instrumentation/IndirectCallPromotion.cpp @@ -45,7 +45,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Transforms/Instrumentation.h" -#include "llvm/Transforms/PGOInstrumentation.h" +#include "llvm/Transforms/Instrumentation/PGOInstrumentation.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/CallPromotionUtils.h" #include diff --git a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp index 62d6711..0aaf874 100644 --- a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp +++ b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp @@ -13,7 +13,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/InstrProfiling.h" +#include "llvm/Transforms/Instrumentation/InstrProfiling.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" diff --git a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp index ab3619e..8bc5671 100644 --- a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp +++ b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp @@ -48,7 +48,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/PGOInstrumentation.h" +#include "llvm/Transforms/Instrumentation/PGOInstrumentation.h" #include "CFGMST.h" #include "llvm/ADT/APInt.h" #include "llvm/ADT/ArrayRef.h" diff --git a/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp b/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp index 95eb368..494aad1 100644 --- a/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp +++ b/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp @@ -44,7 +44,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" #include "llvm/Transforms/Instrumentation.h" -#include "llvm/Transforms/PGOInstrumentation.h" +#include "llvm/Transforms/Instrumentation/PGOInstrumentation.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include #include -- 2.7.4