Move some includes from SPIRVDebug.h to .cpp files

Header files should only include the minimum required, to keep build
times reasonable.

Author: svenvh

llvm-spirv/lib/SPIRV/OCL20ToSPIRV.cpp

@@ -49,6 +49,7 @@
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/Debug.h"
 
 #include <algorithm>
 #include <set>

llvm-spirv/lib/SPIRV/OCL21ToSPIRV.cpp

@@ -46,6 +46,7 @@
 #include "llvm/IR/InstVisitor.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/Debug.h"
 
 #include <set>
 

llvm-spirv/lib/SPIRV/PreprocessMetadata.cpp

@@ -49,6 +49,7 @@
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/InstVisitor.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/CommandLine.h"
 
 using namespace llvm;
 using namespace SPIRV;

llvm-spirv/lib/SPIRV/SPIRVLowerConstExpr.cpp

@@ -49,6 +49,7 @@
 #include "llvm/IR/InstVisitor.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/CommandLine.h"
 
 #include <list>
 #include <set>

llvm-spirv/lib/SPIRV/SPIRVLowerSaddWithOverflow.cpp

@@ -51,6 +51,7 @@
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Linker/Linker.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/SourceMgr.h"
 
 using namespace llvm;
 using namespace SPIRV;

llvm-spirv/lib/SPIRV/SPIRVRegularizeLLVM.cpp

@@ -45,6 +45,7 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Operator.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/Debug.h"
 
 #include <set>
 #include <vector>

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDebug.cpp

@@ -40,6 +40,7 @@
 #include "SPIRVDebug.h"
 
 #include "llvm/IR/Verifier.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/raw_ostream.h"
 
 #define DEBUG_TYPE "spirv-regularization"
@@ -51,12 +52,12 @@ SPIRV::SPIRVDbgErrorHandlingKinds SPIRV::SPIRVDbgError =
     SPIRVDbgErrorHandlingKinds::Exit;
 bool SPIRV::SPIRVDbgErrorMsgIncludesSourceInfo = true;
 
-llvm::cl::opt<bool> SPIRV::VerifyRegularizationPasses(
+namespace SPIRV {
+llvm::cl::opt<bool> VerifyRegularizationPasses(
     "spirv-verify-regularize-passes", llvm::cl::init(_SPIRVDBG),
     llvm::cl::desc(
         "Verify module after each pass in LLVM regularization phase"));
 
-namespace SPIRV {
 void verifyRegularizationPass(llvm::Module &M, const std::string &PassName) {
   if (VerifyRegularizationPasses) {
     std::string Err;

llvm-spirv/lib/SPIRV/libSPIRV/SPIRVDebug.h

@@ -41,16 +41,15 @@
 #define SPIRV_LIBSPIRV_SPIRVDEBUG_H
 
 #include "SPIRVUtil.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
 
 #include <iostream>
 #include <string>
 
-namespace SPIRV {
+namespace llvm {
+class Module;
+}
 
-extern llvm::cl::opt<bool> VerifyRegularizationPasses;
+namespace SPIRV {
 
 // Include source file and line number in error message.
 extern bool SPIRVDbgErrorMsgIncludesSourceInfo;