android: [InstCombine] Move target-specific inst combining

Porting of commit
2a6c871596ce ("[InstCombine] Move target-specific inst combining")

Fixes the following building error:

module source path "external/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineTables.td" does not exist

diff --git a/llvm/lib/Target/AMDGPU/Android.bp b/llvm/lib/Target/AMDGPU/Android.bp
index aadb5d4..3c6ff98 100644 (file)
--- a/llvm/lib/Target/AMDGPU/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Android.bp
@@ -12,6 +12,7 @@ cc_defaults {
     generated_headers: [
         "llvm-gen-amdgpu",
         "llvm-gen-amdgpuisel",
+        "llvm-gen-instcombine",
         "llvm-gen-r600",
     ],
     static_libs: ["llvm-amdgpu-headers"],
@@ -61,6 +62,12 @@ llvm_tblgen {
 }
 
 llvm_tblgen {
+    name: "llvm-gen-instcombine",
+    in: "InstCombineTables.td",
+    outs: ["InstCombineTables.inc"],
+}
+
+llvm_tblgen {
     name: "llvm-gen-r600",
     in: "R600.td",
     outs: [

diff --git a/llvm/lib/Transforms/InstCombine/Android.bp b/llvm/lib/Transforms/InstCombine/Android.bp
index 1d64cca..dfcc7ca 100644 (file)
--- a/llvm/lib/Transforms/InstCombine/Android.bp
+++ b/llvm/lib/Transforms/InstCombine/Android.bp
@@ -3,12 +3,5 @@ cc_library_static {
     defaults: [
         "llvm-lib-defaults",
     ],
-    generated_headers: ["llvm-gen-instcombine"],
     srcs: ["*.cpp"],
 }
-
-llvm_tblgen {
-    name: "llvm-gen-instcombine",
-    in: "InstCombineTables.td",
-    outs: ["InstCombineTables.inc"],
-}