android: AMDGPU: add support for Disassembler target

Necessary for the new Valve ACO compiler in mesa 19.3

LLVMInitializeAMDGPUDisassembler() function exposed conditionally
to FORCE_BUILD_AMDGPU macro definition in mesa src/amd/Android.compiler.mk
as per other AMDGPU targets

Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>

diff --git a/llvm/Android.bp b/llvm/Android.bp
index 1dd06b9..47802e5 100644 (file)
--- a/llvm/Android.bp
+++ b/llvm/Android.bp
@@ -216,6 +216,7 @@ llvm_amdgpu_static_libraries = [
     "libLLVMAMDGPUAsmParser",
     "libLLVMAMDGPUAsmPrinter",
     "libLLVMAMDGPUUtils",
+    "libLLVMAMDGPUDisassembler",
 ]
 
 

diff --git a/llvm/device/include/llvm/Config/Disassemblers.def b/llvm/device/include/llvm/Config/Disassemblers.def
index a1ae811..b4b42d9 100755 (executable)
--- a/llvm/device/include/llvm/Config/Disassemblers.def
+++ b/llvm/device/include/llvm/Config/Disassemblers.def
@@ -31,6 +31,10 @@
 #elif defined(__i386__) || defined(__x86_64__)
   LLVM_DISASSEMBLER(X86)
 
+#if defined(FORCE_BUILD_AMDGPU)
+  LLVM_DISASSEMBLER(AMDGPU)
+#endif
+
 #if defined(FORCE_BUILD_ARM)
   LLVM_DISASSEMBLER(ARM)
   LLVM_DISASSEMBLER(AArch64)

diff --git a/llvm/lib/Target/AMDGPU/Android.bp b/llvm/lib/Target/AMDGPU/Android.bp
index 0a88ad1..fa77f1e 100644 (file)
--- a/llvm/lib/Target/AMDGPU/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Android.bp
@@ -42,6 +42,7 @@ llvm_tblgen {
         "AMDGPUGenGlobalISel.inc",
         "AMDGPUGenMCPseudoLowering.inc",
         "AMDGPUGenSearchableTables.inc",
+        "AMDGPUGenDisassemblerTables.inc",
     ],
 }
 

diff --git a/llvm/lib/Target/AMDGPU/Disassembler/Android.bp b/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
new file mode 100644 (file)
index 0000000..b184ef0
--- /dev/null
+++ b/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
@@ -0,0 +1,8 @@
+cc_library_static {
+    name: "libLLVMAMDGPUDisassembler",
+    defaults: [
+        "llvm-lib-defaults",
+        "llvm-amdgpu-defaults",
+    ],
+    srcs: ["*.cpp"],
+}