summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--llvm/lib/Target/AArch64/AArch64.td5
-rw-r--r--llvm/lib/Target/AArch64/AArch64MacroFusion.cpp20
-rw-r--r--llvm/lib/Target/AArch64/AArch64Subtarget.h2
-rw-r--r--llvm/test/CodeGen/AArch64/misched-fusion-crypto-eor.mir75
4 files changed, 102 insertions, 0 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64.td b/llvm/lib/Target/AArch64/AArch64.td
index f0e6889a04e..3931cd51fe9 100644
--- a/llvm/lib/Target/AArch64/AArch64.td
+++ b/llvm/lib/Target/AArch64/AArch64.td
@@ -156,6 +156,10 @@ def FeatureFuseAES : SubtargetFeature<
"fuse-aes", "HasFuseAES", "true",
"CPU fuses AES crypto operations">;
+def FeatureFuseCryptoEOR : SubtargetFeature<
+ "fuse-crypto-eor", "HasFuseCryptoEOR", "true",
+ "CPU fuses AES/PMULL and EOR operations">;
+
def FeatureFuseCCSelect : SubtargetFeature<
"fuse-csel", "HasFuseCCSelect", "true",
"CPU fuses conditional select operations">;
@@ -343,6 +347,7 @@ def ProcCyclone : SubtargetFeature<"cyclone", "ARMProcFamily", "Cyclone",
FeatureDisableLatencySchedHeuristic,
FeatureFPARMv8,
FeatureFuseAES,
+ FeatureFuseCryptoEOR,
FeatureNEON,
FeaturePerfMon,
FeatureZCRegMove,
diff --git a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp b/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp
index 9ec0ad34e92..43ebcfd9893 100644
--- a/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp
+++ b/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp
@@ -123,6 +123,24 @@ static bool isAESPair(unsigned FirstOpcode, unsigned SecondOpcode) {
return false;
}
+/// AESE/AESD/PMULL + EOR.
+static bool isCryptoEORPair(unsigned FirstOpcode, unsigned SecondOpcode) {
+ if (SecondOpcode != AArch64::EORv16i8)
+ return false;
+
+ switch (FirstOpcode) {
+ case AArch64::INSTRUCTION_LIST_END:
+ case AArch64::AESErr:
+ case AArch64::AESDrr:
+ case AArch64::PMULLv16i8:
+ case AArch64::PMULLv8i8:
+ case AArch64::PMULLv1i64:
+ case AArch64::PMULLv2i64:
+ return true;
+ }
+ return false;
+}
+
/// Literal generation.
static bool isLiteralsPair(unsigned FirstOpcode, unsigned SecondOpcode,
const MachineInstr *FirstMI,
@@ -258,6 +276,8 @@ static bool shouldScheduleAdjacent(const TargetInstrInfo &TII,
return true;
if (ST.hasFuseAES() && isAESPair(FirstOpc, SecondOpc))
return true;
+ if (ST.hasFuseCryptoEOR() && isCryptoEORPair(FirstOpc, SecondOpc))
+ return true;
if (ST.hasFuseLiterals() &&
isLiteralsPair(FirstOpc, SecondOpc, FirstMI, SecondMI))
return true;
diff --git a/llvm/lib/Target/AArch64/AArch64Subtarget.h b/llvm/lib/Target/AArch64/AArch64Subtarget.h
index 8ac6903bce3..6086723858c 100644
--- a/llvm/lib/Target/AArch64/AArch64Subtarget.h
+++ b/llvm/lib/Target/AArch64/AArch64Subtarget.h
@@ -123,6 +123,7 @@ protected:
bool HasArithmeticCbzFusion = false;
bool HasFuseAddress = false;
bool HasFuseAES = false;
+ bool HasFuseCryptoEOR = false;
bool HasFuseCCSelect = false;
bool HasFuseLiterals = false;
bool DisableLatencySchedHeuristic = false;
@@ -256,6 +257,7 @@ public:
bool hasArithmeticCbzFusion() const { return HasArithmeticCbzFusion; }
bool hasFuseAddress() const { return HasFuseAddress; }
bool hasFuseAES() const { return HasFuseAES; }
+ bool hasFuseCryptoEOR() const { return HasFuseCryptoEOR; }
bool hasFuseCCSelect() const { return HasFuseCCSelect; }
bool hasFuseLiterals() const { return HasFuseLiterals; }
diff --git a/llvm/test/CodeGen/AArch64/misched-fusion-crypto-eor.mir b/llvm/test/CodeGen/AArch64/misched-fusion-crypto-eor.mir
new file mode 100644
index 00000000000..ca64bd47990
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/misched-fusion-crypto-eor.mir
@@ -0,0 +1,75 @@
+# RUN: llc -o /dev/null %s -run-pass=machine-scheduler -mtriple aarch64-- -mattr=-fuse-aes,+crypto -misched-print-dags 2>&1 | FileCheck %s --check-prefixes=CHECK,NOFUSE
+# RUN: llc -o /dev/null %s -run-pass=machine-scheduler -mtriple aarch64-- -mattr=+fuse-aes,+crypto -misched-print-dags 2>&1 | FileCheck %s --check-prefixes=CHECK,FUSEAES
+# RUN: llc -o /dev/null %s -run-pass=machine-scheduler -mtriple aarch64-- -mattr=+fuse-aes,+fuse-crypto-eor,+crypto -misched-print-dags 2>&1 | FileCheck %s --check-prefixes=CHECK,FUSEAES,FUSECRYPTO
+# REQUIRES: asserts
+
+name: func
+body: |
+ bb.0:
+ ; CHECK: SU(0): %0:fpr128 = AESErr undef $q0, undef $q1
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES: SU(1): Ord Latency=0 Cluster
+ ; CHECK: SU(1): %1:fpr128 = AESMCrrTied %0:fpr128
+ %0:fpr128 = AESErr undef $q0, undef $q1
+ %1:fpr128 = AESMCrrTied %0
+
+ ; CHECK: SU(2): %2:fpr128 = AESErr undef $q2, undef $q3
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES: SU(3): Ord Latency=0 Cluster
+ ; CHECK: SU(3): dead %3:fpr128 = AESMCrr %2:fpr128
+ %2:fpr128 = AESErr undef $q2, undef $q3
+ %3:fpr128 = AESMCrr %2
+
+ ; CHECK: SU(4): %4:fpr128 = AESErr %1:fpr128, undef $q4
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES-NOT: SU({{.*}}): Ord
+ ; FUSECRYPTO: SU(5): Ord Latency=0 Cluster
+ ; CHECK: SU(5): dead %5:fpr128 = EORv16i8 %4:fpr128, undef $q5
+ %4:fpr128 = AESErr %1, undef $q4
+ %5:fpr128 = EORv16i8 %4, undef $q5
+
+ ; CHECK: SU(6): %6:fpr128 = AESDrr undef $q0, undef $q1
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES: SU(7): Ord Latency=0 Cluster
+ ; CHECK: SU(7): %7:fpr128 = AESIMCrrTied %6:fpr128
+ %6:fpr128 = AESDrr undef $q0, undef $q1
+ %7:fpr128 = AESIMCrrTied %6
+
+ ; CHECK: SU(8): %8:fpr128 = AESDrr undef $q2, undef $q3
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES: SU(9): Ord Latency=0 Cluster
+ ; CHECK: SU(9): dead %9:fpr128 = AESIMCrr %8:fpr128
+ %8:fpr128 = AESDrr undef $q2, undef $q3
+ %9:fpr128 = AESIMCrr %8
+
+ ; CHECK: SU(10): %10:fpr128 = AESDrr %7:fpr128, undef $q0
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES-NOT: SU({{.*}}): Ord
+ ; FUSECRYPTO: SU(11): Ord Latency=0 Cluster
+ ; CHECK: SU(11): dead %11:fpr128 = EORv16i8 %10:fpr128, undef $q1
+ %10:fpr128 = AESDrr %7, undef $q0
+ %11:fpr128 = EORv16i8 %10, undef $q1
+
+ ; CHECK: SU(12): %12:fpr128 = PMULLv16i8 undef $q0, undef $q1
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES-NOT: SU({{.*}}): Ord
+ ; FUSECRYPTO: SU(13): Ord Latency=0 Cluster
+ ; CHECK: SU(13): dead %13:fpr128 = EORv16i8 %12:fpr128, undef $q2
+ %12:fpr128 = PMULLv16i8 undef $q0, undef $q1
+ %13:fpr128 = EORv16i8 %12, undef $q2
+
+ ; CHECK: SU(14): %14:fpr128 = PMULLv8i8 undef $d0, undef $d1
+ ; CHECK: Successors:
+ ; NOFUSE-NOT: SU({{.*}}): Ord
+ ; FUSEAES-NOT: SU({{.*}}): Ord
+ ; FUSECRYPTO: SU(15): Ord Latency=0 Cluster
+ ; CHECK: SU(15): dead %15:fpr128 = EORv16i8 %14:fpr128, undef $q3
+ %14:fpr128 = PMULLv8i8 undef $d0, undef $d1
+ %15:fpr128 = EORv16i8 %14, undef $q3
OpenPOWER on IntegriCloud