android: [IR] Split Intrinsics.inc into enums and implementations

Reference:
af7c445 ("[IR] Split Intrinsics.inc into enums and implementations")

diff --git a/Android.bp b/Android.bp
index a0439ea..1d2adc7 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -146,7 +146,10 @@ llvm_tblgen {
 llvm_tblgen {
     name: "llvm-gen-intrinsics",
     in: "include/llvm/IR/Intrinsics.td",
-    outs: ["llvm/IR/Intrinsics.inc"],
+    outs: [
+        "llvm/IR/IntrinsicEnums.inc",
+        "llvm/IR/IntrinsicImpl.inc",
+    ],
 }
 
 force_build_llvm_components_defaults {

diff --git a/lib/Target/AMDGPU/Android.bp b/lib/Target/AMDGPU/Android.bp
index e7f13e8..2a21676 100644 (file)
--- a/lib/Target/AMDGPU/Android.bp
+++ b/lib/Target/AMDGPU/Android.bp
@@ -36,7 +36,8 @@ llvm_tblgen {
         "AMDGPUGenDAGISel.inc",
         "AMDGPUGenCallingConv.inc",
         "AMDGPUGenSubtargetInfo.inc",
-        "AMDGPUGenIntrinsics.inc",
+        "AMDGPUGenIntrinsicEnums.inc",
+        "AMDGPUGenIntrinsicImpl.inc",
         "AMDGPUGenDFAPacketizer.inc",
         "AMDGPUGenRegisterBank.inc",
         "AMDGPUGenGlobalISel.inc",

diff --git a/soong/tblgen.go b/soong/tblgen.go
index 1e8eb67..a80e11c 100644 (file)
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -122,8 +122,10 @@ func outToGenerator(ctx android.ModuleContext, out string) string {
                return "-gen-subtarget"
        case strings.HasSuffix(out, "GenCallingConv.inc"):
                return "-gen-callingconv"
-       case strings.HasSuffix(out, "GenIntrinsics.inc"):
-               return "-gen-tgt-intrinsic"
+       case strings.HasSuffix(out, "GenIntrinsicEnums.inc"):
+               return "-gen-tgt-intrinsic-enums"
+       case strings.HasSuffix(out, "GenIntrinsicImpl.inc"):
+               return "-gen-tgt-intrinsic-impl"
        case strings.HasSuffix(out, "GenDecoderTables.inc"):
                return "-gen-arm-decoder"
        case strings.HasSuffix(out, "Options.inc"):
@@ -138,8 +140,10 @@ func outToGenerator(ctx android.ModuleContext, out string) string {
                return "-gen-x86-EVEX2VEX-tables"
        case out == "Attributes.inc", out == "AttributesCompatFunc.inc":
                return "-gen-attrs"
-       case out == "Intrinsics.inc":
-               return "-gen-intrinsic"
+       case out == "IntrinsicEnums.inc":
+               return "-gen-intrinsic-enums"
+       case out == "IntrinsicImpl.inc":
+               return "-gen-intrinsic-impl"
        }
 
        ctx.ModuleErrorf("couldn't map output file %q to a generator", out)