android: [AArch64][GlobalISel] Add a post-legalizer combiner with a very simple combine.

Port to Android.bp of commit 49a4f3f7d88f61a81279de3d4e1c734ab0363228
"[AArch64][GlobalISel] Add a post-legalizer combiner with a very simple combine."

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

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

diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index d8f74e3..c015cf6 100644 (file)
--- a/llvm/soong/tblgen.go
+++ b/llvm/soong/tblgen.go
@@ -139,8 +139,10 @@ 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"):
+       case strings.HasSuffix(out, "AArch64GenPreLegalizeGICombiner.inc"):
                return "-gen-global-isel-combiner -combiners=\"AArch64PreLegalizerCombinerHelper\""
+       case strings.HasSuffix(out, "AArch64GenPostLegalizeGICombiner.inc"):
+               return "-gen-global-isel-combiner -combiners=\"AArch64PostLegalizerCombinerHelper\""
        case strings.HasSuffix(out, "GenGlobalISel.inc"):
                return "-gen-global-isel"
        case strings.HasSuffix(out, "X86GenEVEX2VEXTables.inc"):