[llvm] f7ae55f - [DirectX] Fix shared libraries build

[Alex Richardson via llvm-commits]

Author: Alex Richardson
Date: 2022-12-01T16:53:42Z
New Revision: f7ae55f03dcbf55e91f143f45b39c599ddfa9c37

URL: https://github.com/llvm/llvm-project/commit/f7ae55f03dcbf55e91f143f45b39c599ddfa9c37
DIFF: https://github.com/llvm/llvm-project/commit/f7ae55f03dcbf55e91f143f45b39c599ddfa9c37.diff

LOG: [DirectX] Fix shared libraries build

I just tried to build all experimental targets and noticed that DirectX did
not build with -DBUILD_SHARED_LIBS=ON.

Differential Revision: https://reviews.llvm.org/D138431

Added: 
    llvm/lib/Target/DirectX/DirectXIRPasses/CMakeLists.txt
    llvm/lib/Target/DirectX/DirectXIRPasses/PointerTypeAnalysis.cpp
    llvm/lib/Target/DirectX/DirectXIRPasses/PointerTypeAnalysis.h

Modified: 
    llvm/lib/Target/DirectX/CMakeLists.txt
    llvm/lib/Target/DirectX/DXILPrepare.cpp
    llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt
    llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp
    llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt

Removed: 
    llvm/lib/Target/DirectX/PointerTypeAnalysis.cpp
    llvm/lib/Target/DirectX/PointerTypeAnalysis.h


################################################################################
diff  --git a/llvm/lib/Target/DirectX/CMakeLists.txt b/llvm/lib/Target/DirectX/CMakeLists.txt
index 9dc4e5b41706b..4a3d67868584d 100644
--- a/llvm/lib/Target/DirectX/CMakeLists.txt
+++ b/llvm/lib/Target/DirectX/CMakeLists.txt
@@ -27,16 +27,22 @@ add_llvm_target(DirectXCodeGen
   DXILResourceAnalysis.cpp
   DXILShaderFlags.cpp
   DXILTranslateMetadata.cpp
-  PointerTypeAnalysis.cpp
 
   LINK_COMPONENTS
+  Analysis
   AsmPrinter
   Core
+  CodeGen
   SelectionDAG
   Support
+  DirectXDesc
   DirectXInfo
+  DirectXPointerTypeAnalysis
   DXILBitWriter
   FrontendHLSL
+  MC
+  Target
+  TransformUtils
 
   ADD_TO_COMPONENT
   DirectX
@@ -44,4 +50,5 @@ add_llvm_target(DirectXCodeGen
 
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
+add_subdirectory(DirectXIRPasses)
 add_subdirectory(DXILWriter)

diff  --git a/llvm/lib/Target/DirectX/DXILPrepare.cpp b/llvm/lib/Target/DirectX/DXILPrepare.cpp
index c044dd2fa592f..316c93806d869 100644
--- a/llvm/lib/Target/DirectX/DXILPrepare.cpp
+++ b/llvm/lib/Target/DirectX/DXILPrepare.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "DirectX.h"
-#include "PointerTypeAnalysis.h"
+#include "DirectXIRPasses/PointerTypeAnalysis.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/CodeGen/Passes.h"

diff  --git a/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt b/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt
index 0e56902c97c91..0493317fc9e56 100644
--- a/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt
+++ b/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt
@@ -9,8 +9,10 @@ add_llvm_component_library(LLVMDXILBitWriter
   intrinsics_gen
 
   LINK_COMPONENTS
+  Analysis
   BitWriter
   Core
+  DirectXPointerTypeAnalysis
   MC
   Object
   Support

diff  --git a/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp b/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp
index 96c88ac49f1a6..0b15937e1a8a4 100644
--- a/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp
+++ b/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp
@@ -12,7 +12,7 @@
 
 #include "DXILBitcodeWriter.h"
 #include "DXILValueEnumerator.h"
-#include "PointerTypeAnalysis.h"
+#include "DirectXIRPasses/PointerTypeAnalysis.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Bitcode/BitcodeCommon.h"

diff  --git a/llvm/lib/Target/DirectX/DirectXIRPasses/CMakeLists.txt b/llvm/lib/Target/DirectX/DirectXIRPasses/CMakeLists.txt
new file mode 100644
index 0000000000000..53f388c6de13c
--- /dev/null
+++ b/llvm/lib/Target/DirectX/DirectXIRPasses/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_llvm_component_library(LLVMDirectXPointerTypeAnalysis
+  PointerTypeAnalysis.cpp
+
+  LINK_COMPONENTS
+  Core
+  Support
+
+  ADD_TO_COMPONENT
+  DirectX
+  )

diff  --git a/llvm/lib/Target/DirectX/PointerTypeAnalysis.cpp b/llvm/lib/Target/DirectX/DirectXIRPasses/PointerTypeAnalysis.cpp
similarity index 100%
rename from llvm/lib/Target/DirectX/PointerTypeAnalysis.cpp
rename to llvm/lib/Target/DirectX/DirectXIRPasses/PointerTypeAnalysis.cpp

diff  --git a/llvm/lib/Target/DirectX/PointerTypeAnalysis.h b/llvm/lib/Target/DirectX/DirectXIRPasses/PointerTypeAnalysis.h
similarity index 100%
rename from llvm/lib/Target/DirectX/PointerTypeAnalysis.h
rename to llvm/lib/Target/DirectX/DirectXIRPasses/PointerTypeAnalysis.h

diff  --git a/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt
index 392fb99b490cf..04506e85a8344 100644
--- a/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt
@@ -4,6 +4,7 @@ add_llvm_component_library(LLVMDirectXDesc
 
   LINK_COMPONENTS
   DirectXInfo
+  MC
   Support
 
   ADD_TO_COMPONENT