From 3a223500710afd20521e59d7cf478e74753f7e7c Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sat, 1 Sep 2018 16:24:14 +0200
Subject: [PATCH] android: [IR] Split Intrinsics.inc into enums and
 implementations

Reference:
af7c445 ("[IR] Split Intrinsics.inc into enums and implementations")
---
 llvm/Android.bp                   |  5 ++++-
 llvm/lib/Target/AMDGPU/Android.bp |  3 ++-
 llvm/soong/tblgen.go              | 12 ++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/llvm/Android.bp b/llvm/Android.bp
index a0439eaecd5..1d2adc73ce0 100644
--- a/llvm/Android.bp
+++ b/llvm/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/llvm/lib/Target/AMDGPU/Android.bp b/llvm/lib/Target/AMDGPU/Android.bp
index e7f13e8f481..2a216769198 100644
--- a/llvm/lib/Target/AMDGPU/Android.bp
+++ b/llvm/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/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index 1e8eb6709c5..a80e11cbf86 100644
--- a/llvm/soong/tblgen.go
+++ b/llvm/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)
-- 
2.11.0