From c0ad80fd9edbbe41461a62d26585bd6263328b90 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Fri, 26 Jun 2009 05:59:16 +0000 Subject: [PATCH] Fix a CodeGenDAGPatterns bug. Check if top level predicates match when it's looking for duplicates. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74276 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/ARM/orn.ll | 13 +++++++++++++ test/CodeGen/Thumb2/thumb2-orn.ll | 13 +++++++++++++ utils/TableGen/CodeGenDAGPatterns.cpp | 4 ++++ 3 files changed, 30 insertions(+) create mode 100644 test/CodeGen/ARM/orn.ll create mode 100644 test/CodeGen/Thumb2/thumb2-orn.ll diff --git a/test/CodeGen/ARM/orn.ll b/test/CodeGen/ARM/orn.ll new file mode 100644 index 00000000000..2c3fcc8d279 --- /dev/null +++ b/test/CodeGen/ARM/orn.ll @@ -0,0 +1,13 @@ +; RUN: llvm-as < %s | llc -march=arm | grep {bic\\W*r\[0-9\]*,\\W*r\[0-9\]*,\\W*r\[0-9\]*} | Count 2 + +define i32 @f1(i32 %a, i32 %b) { + %tmp = xor i32 %b, 4294967295 + %tmp1 = and i32 %a, %tmp + ret i32 %tmp1 +} + +define i32 @f2(i32 %a, i32 %b) { + %tmp = xor i32 %b, 4294967295 + %tmp1 = and i32 %tmp, %a + ret i32 %tmp1 +} diff --git a/test/CodeGen/Thumb2/thumb2-orn.ll b/test/CodeGen/Thumb2/thumb2-orn.ll new file mode 100644 index 00000000000..291858581ba --- /dev/null +++ b/test/CodeGen/Thumb2/thumb2-orn.ll @@ -0,0 +1,13 @@ +; RUN: llvm-as < %s | llc -march=thumb -mattr=+thumb2 | grep {bic\\W*r\[0-9\]*,\\W*r\[0-9\]*,\\W*r\[0-9\]*} | Count 2 + +define i32 @f1(i32 %a, i32 %b) { + %tmp = xor i32 %b, 4294967295 + %tmp1 = and i32 %a, %tmp + ret i32 %tmp1 +} + +define i32 @f2(i32 %a, i32 %b) { + %tmp = xor i32 %b, 4294967295 + %tmp1 = and i32 %tmp, %a + ret i32 %tmp1 +} diff --git a/utils/TableGen/CodeGenDAGPatterns.cpp b/utils/TableGen/CodeGenDAGPatterns.cpp index 839059db3aa..6a7d305f783 100644 --- a/utils/TableGen/CodeGenDAGPatterns.cpp +++ b/utils/TableGen/CodeGenDAGPatterns.cpp @@ -2390,6 +2390,10 @@ void CodeGenDAGPatterns::GenerateVariants() { // Scan to see if an instruction or explicit pattern already matches this. bool AlreadyExists = false; for (unsigned p = 0, e = PatternsToMatch.size(); p != e; ++p) { + // Skip if the top level predicates do not match. + if (PatternsToMatch[i].getPredicates() != + PatternsToMatch[p].getPredicates()) + continue; // Check to see if this variant already exists. if (Variant->isIsomorphicTo(PatternsToMatch[p].getSrcPattern(), DepVars)) { DOUT << " *** ALREADY EXISTS, ignoring variant.\n"; -- 2.11.0