From 8d14e1d2d998c8f0c80f33095d43e210a4c8c3d6 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 25 Jul 2020 00:20:20 +0200 Subject: [PATCH] android: [AArch64][GlobalISel] Add a post-legalizer combiner with a very simple combine. Port to Android.bp of commit 49a4f3f7d88f61a81279de3d4e1c734ab0363228 "[AArch64][GlobalISel] Add a post-legalizer combiner with a very simple combine." Signed-off-by: Mauro Rossi --- llvm/lib/Target/AArch64/Android.bp | 3 ++- llvm/soong/tblgen.go | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/llvm/lib/Target/AArch64/Android.bp b/llvm/lib/Target/AArch64/Android.bp index 40ad882c2fb..697e86f9c25 100644 --- a/llvm/lib/Target/AArch64/Android.bp +++ b/llvm/lib/Target/AArch64/Android.bp @@ -44,7 +44,8 @@ llvm_tblgen { "AArch64GenSystemOperands.inc", "AArch64GenRegisterBank.inc", "AArch64GenGlobalISel.inc", - "AArch64GenGICombiner.inc", + "AArch64GenPreLegalizeGICombiner.inc", + "AArch64GenPostLegalizeGICombiner.inc", ], } diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go index d8f74e31b3a..c015cf68896 100644 --- a/llvm/soong/tblgen.go +++ b/llvm/soong/tblgen.go @@ -139,8 +139,10 @@ func outToGenerator(ctx android.ModuleContext, out string) string { return "-gen-dfa-packetizer" case strings.HasSuffix(out, "GenRegisterBank.inc"): return "-gen-register-bank" - case strings.HasSuffix(out, "GenGICombiner.inc"): + case strings.HasSuffix(out, "AArch64GenPreLegalizeGICombiner.inc"): return "-gen-global-isel-combiner -combiners=\"AArch64PreLegalizerCombinerHelper\"" + case strings.HasSuffix(out, "AArch64GenPostLegalizeGICombiner.inc"): + return "-gen-global-isel-combiner -combiners=\"AArch64PostLegalizerCombinerHelper\"" case strings.HasSuffix(out, "GenGlobalISel.inc"): return "-gen-global-isel" case strings.HasSuffix(out, "X86GenEVEX2VEXTables.inc"): -- 2.11.0