android: AMDGPU/GlobalISel: Introduce post-legalize combiner

android: AMDGPU/GlobalISel: Introduce post-legalize combiner

Port to Android.bp of commit
fee41517fe0 ("AMDGPU/GlobalISel: Introduce post-legalize combiner")

Fixes the following build error:

external/llvm-project/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp:229:10:
fatal error: 'AMDGPUGenPostLegalizeGICombiner.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 8af2dc4..4b74976 100644 (file)
--- a/llvm/lib/Target/AMDGPU/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Android.bp
@@ -55,6 +55,7 @@ llvm_tblgen {
     outs: [
         "AMDGPUGenGlobalISel.inc",
         "AMDGPUGenPreLegalizeGICombiner.inc",
+        "AMDGPUGenPostLegalizeGICombiner.inc",
     ],
 }
 

diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index 5ccc4df..bd74353 100644 (file)
--- a/llvm/soong/tblgen.go
+++ b/llvm/soong/tblgen.go
@@ -145,6 +145,8 @@ func outToGenerator(ctx android.ModuleContext, out string) string {
                return "-gen-global-isel-combiner -combiners=\"AArch64PostLegalizerCombinerHelper\""
        case strings.HasSuffix(out, "AMDGPUGenPreLegalizeGICombiner.inc"):
                return "-gen-global-isel-combiner -combiners=\"AMDGPUPreLegalizerCombinerHelper\""
+       case strings.HasSuffix(out, "AMDGPUGenPostLegalizeGICombiner.inc"):
+               return "-gen-global-isel-combiner -combiners=\"AMDGPUPostLegalizerCombinerHelper\""
        case strings.HasSuffix(out, "GenGlobalISel.inc"):
                return "-gen-global-isel"
        case strings.HasSuffix(out, "X86GenEVEX2VEXTables.inc"):