[llvm] r328262 - Move SampleProfile.h into IPO along with the rest of the IPO pass headers

[David Blaikie via llvm-commits]

Author: dblaikie
Date: Thu Mar 22 15:42:44 2018
New Revision: 328262

URL: http://llvm.org/viewvc/llvm-project?rev=328262&view=rev
Log:
Move SampleProfile.h into IPO along with the rest of the IPO pass headers

Added:
    llvm/trunk/include/llvm/Transforms/IPO/SampleProfile.h
      - copied, changed from r328259, llvm/trunk/include/llvm/Transforms/SampleProfile.h
Removed:
    llvm/trunk/include/llvm/Transforms/SampleProfile.h
Modified:
    llvm/trunk/lib/Passes/PassBuilder.cpp
    llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp

Copied: llvm/trunk/include/llvm/Transforms/IPO/SampleProfile.h (from r328259, llvm/trunk/include/llvm/Transforms/SampleProfile.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/IPO/SampleProfile.h?p2=llvm/trunk/include/llvm/Transforms/IPO/SampleProfile.h&p1=llvm/trunk/include/llvm/Transforms/SampleProfile.h&r1=328259&r2=328262&rev=328262&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/SampleProfile.h (original)
+++ llvm/trunk/include/llvm/Transforms/IPO/SampleProfile.h Thu Mar 22 15:42:44 2018
@@ -1,4 +1,4 @@
-//===- Transforms/SampleProfile.h - SamplePGO pass --------------*- C++ -*-===//
+//===- SampleProfile.h - SamplePGO pass ---------- --------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TRANSFORMS_SAMPLEPROFILE_H
-#define LLVM_TRANSFORMS_SAMPLEPROFILE_H
+#ifndef LLVM_TRANSFORMS_IPO_SAMPLEPROFILE_H
+#define LLVM_TRANSFORMS_IPO_SAMPLEPROFILE_H
 
 #include "llvm/IR/PassManager.h"
 #include <string>

Removed: llvm/trunk/include/llvm/Transforms/SampleProfile.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/SampleProfile.h?rev=328261&view=auto
==============================================================================
--- llvm/trunk/include/llvm/Transforms/SampleProfile.h (original)
+++ llvm/trunk/include/llvm/Transforms/SampleProfile.h (removed)
@@ -1,40 +0,0 @@
-//===- Transforms/SampleProfile.h - SamplePGO pass --------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// This file provides the interface for the sampled PGO loader pass.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TRANSFORMS_SAMPLEPROFILE_H
-#define LLVM_TRANSFORMS_SAMPLEPROFILE_H
-
-#include "llvm/IR/PassManager.h"
-#include <string>
-
-namespace llvm {
-
-class Module;
-
-/// The sample profiler data loader pass.
-class SampleProfileLoaderPass : public PassInfoMixin<SampleProfileLoaderPass> {
-public:
-  SampleProfileLoaderPass(std::string File = "", bool IsThinLTOPreLink = false)
-      : ProfileFileName(File), IsThinLTOPreLink(IsThinLTOPreLink) {}
-
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-
-private:
-  std::string ProfileFileName;
-  bool IsThinLTOPreLink;
-};
-
-} // end namespace llvm
-
-#endif // LLVM_TRANSFORMS_SAMPLEPROFILE_H

Modified: llvm/trunk/lib/Passes/PassBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Passes/PassBuilder.cpp?rev=328262&r1=328261&r2=328262&view=diff
==============================================================================
--- llvm/trunk/lib/Passes/PassBuilder.cpp (original)
+++ llvm/trunk/lib/Passes/PassBuilder.cpp Thu Mar 22 15:42:44 2018
@@ -80,6 +80,7 @@
 #include "llvm/Transforms/IPO/LowerTypeTests.h"
 #include "llvm/Transforms/IPO/PartialInlining.h"
 #include "llvm/Transforms/IPO/SCCP.h"
+#include "llvm/Transforms/IPO/SampleProfile.h"
 #include "llvm/Transforms/IPO/StripDeadPrototypes.h"
 #include "llvm/Transforms/IPO/SyntheticCountsPropagation.h"
 #include "llvm/Transforms/IPO/WholeProgramDevirt.h"
@@ -87,7 +88,6 @@
 #include "llvm/Transforms/InstrProfiling.h"
 #include "llvm/Transforms/Instrumentation/BoundsChecking.h"
 #include "llvm/Transforms/PGOInstrumentation.h"
-#include "llvm/Transforms/SampleProfile.h"
 #include "llvm/Transforms/Scalar/ADCE.h"
 #include "llvm/Transforms/Scalar/AlignmentFromAssumptions.h"
 #include "llvm/Transforms/Scalar/BDCE.h"

Modified: llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp?rev=328262&r1=328261&r2=328262&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/SampleProfile.cpp Thu Mar 22 15:42:44 2018
@@ -22,7 +22,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/SampleProfile.h"
+#include "llvm/Transforms/IPO/SampleProfile.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"