android: AMDGPU/GlobalISel: Add pre-legalize combiner pass

Port to Android.bp of commit
a174f0da62f ("AMDGPU/GlobalISel: Add pre-legalize combiner pass")

Fixes the following build error:

external/llvm-project/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp:32:10:
fatal error: 'AMDGPUGenPreLegalizeGICombiner.inc' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

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

diff --git a/llvm/lib/Target/AMDGPU/Android.bp b/llvm/lib/Target/AMDGPU/Android.bp
index 1412c0b..8af2dc4 100644 (file)
--- a/llvm/lib/Target/AMDGPU/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Android.bp
@@ -54,6 +54,7 @@ llvm_tblgen {
     in: "AMDGPUGISel.td",
     outs: [
         "AMDGPUGenGlobalISel.inc",
+        "AMDGPUGenPreLegalizeGICombiner.inc",
     ],
 }
 

diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index c015cf6..5ccc4df 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, "AMDGPUGenPreLegalizeGICombiner.inc"):
+               return "-gen-global-isel-combiner -combiners=\"AMDGPUPreLegalizerCombinerHelper\""
        case strings.HasSuffix(out, "GenGlobalISel.inc"):
                return "-gen-global-isel"
        case strings.HasSuffix(out, "X86GenEVEX2VEXTables.inc"):