android: [AArch64][GlobalISel] Split post-legalizer combiner

Porting of commit
147b9497e79a ("[AArch64][GlobalISel] Split post-legalizer combiner to allow for lowering at -O0")

Fixes the following building error:

external/llvm-project/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerLowering.cpp:614:10: fatal error: 'AArch64GenPostLegalizeGILowering.inc' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

diff --git a/llvm/lib/Target/AArch64/Android.bp b/llvm/lib/Target/AArch64/Android.bp
index 97fe0ab..d8f68f5 100644 (file)
--- a/llvm/lib/Target/AArch64/Android.bp
+++ b/llvm/lib/Target/AArch64/Android.bp
@@ -49,6 +49,7 @@ llvm_tblgen {
         "AArch64GenGlobalISel.inc",
         "AArch64GenPreLegalizeGICombiner.inc",
         "AArch64GenPostLegalizeGICombiner.inc",
+        "AArch64GenPostLegalizeGILowering.inc",
     ],
 }
 

diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index 56b513c..de9c58e 100644 (file)
--- a/llvm/soong/tblgen.go
+++ b/llvm/soong/tblgen.go
@@ -143,6 +143,8 @@ func outToGenerator(ctx android.ModuleContext, out string) string {
                return "-gen-global-isel-combiner -combiners=\"AArch64PreLegalizerCombinerHelper\""
        case strings.HasSuffix(out, "AArch64GenPostLegalizeGICombiner.inc"):
                return "-gen-global-isel-combiner -combiners=\"AArch64PostLegalizerCombinerHelper\""
+       case strings.HasSuffix(out, "AArch64GenPostLegalizeGILowering.inc"):
+               return "-gen-global-isel-combiner -combiners=\"AArch64PostLegalizerLoweringHelper\""
        case strings.HasSuffix(out, "AMDGPUGenPreLegalizeGICombiner.inc"):
                return "-gen-global-isel-combiner -combiners=\"AMDGPUPreLegalizerCombinerHelper\""
        case strings.HasSuffix(out, "AMDGPUGenPostLegalizeGICombiner.inc"):