android: tblgen: generate AArch64GenGICombiner.inc

Fixes the following building error:

external/llvm/lib/Target/AArch64/AArch64PreLegalizerCombiner.cpp:31:10:
fatal error: 'AArch64GenGICombiner.inc' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

diff --git a/llvm/lib/Target/AArch64/Android.bp b/llvm/lib/Target/AArch64/Android.bp
index 125558f..40ad882 100644 (file)
--- a/llvm/lib/Target/AArch64/Android.bp
+++ b/llvm/lib/Target/AArch64/Android.bp
@@ -44,6 +44,7 @@ llvm_tblgen {
         "AArch64GenSystemOperands.inc",
         "AArch64GenRegisterBank.inc",
         "AArch64GenGlobalISel.inc",
+        "AArch64GenGICombiner.inc",
     ],
 }
 

diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index 0ce2736..39eafde 100644 (file)
--- a/llvm/soong/tblgen.go
+++ b/llvm/soong/tblgen.go
@@ -139,6 +139,8 @@ func outToGenerator(ctx android.ModuleContext, out string) string {
                return "-gen-dfa-packetizer"
        case strings.HasSuffix(out, "GenRegisterBank.inc"):
                return "-gen-register-bank"
+       case strings.HasSuffix(out, "GenGICombiner.inc"):
+               return "-gen-global-isel-combiner -combiners=\"AArch64PreLegalizerCombinerHelper\""
        case strings.HasSuffix(out, "GenGlobalISel.inc"):
                return "-gen-global-isel"
        case strings.HasSuffix(out, "X86GenEVEX2VEXTables.inc"):