[llvm-commits] [llvm] r126298 - in /llvm/trunk/lib/Target/ARM: ARMInstrFormats.td NEONMoveFix.cpp

[Evan Cheng]

Author: evancheng
Date: Tue Feb 22 20:35:33 2011
New Revision: 126298

URL: http://llvm.org/viewvc/llvm-project?rev=126298&view=rev
Log:
Change VFPNeonA8 definition to make the code easier to read.

Modified:
    llvm/trunk/lib/Target/ARM/ARMInstrFormats.td
    llvm/trunk/lib/Target/ARM/NEONMoveFix.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMInstrFormats.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrFormats.td?rev=126298&r1=126297&r2=126298&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMInstrFormats.td (original)
+++ llvm/trunk/lib/Target/ARM/ARMInstrFormats.td Tue Feb 22 20:35:33 2011
@@ -134,7 +134,7 @@
 def VFPDomain     : Domain<1>; // Instructions in VFP domain only
 def NeonDomain    : Domain<2>; // Instructions in Neon domain only
 def VFPNeonDomain : Domain<3>; // Instructions in both VFP & Neon domains
-def VFPNeonA8Domain : Domain<7>; // Instructions in VFP & Neon under A8
+def VFPNeonA8Domain : Domain<5>; // Instructions in VFP & Neon under A8
 
 //===----------------------------------------------------------------------===//
 // ARM special operands.

Modified: llvm/trunk/lib/Target/ARM/NEONMoveFix.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/NEONMoveFix.cpp?rev=126298&r1=126297&r2=126298&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/NEONMoveFix.cpp (original)
+++ llvm/trunk/lib/Target/ARM/NEONMoveFix.cpp Tue Feb 22 20:35:33 2011
@@ -45,13 +45,8 @@
 }
 
 static bool inNEONDomain(unsigned Domain, bool isA8) {
-  if (Domain & ARMII::DomainNEON) {
-    // Some instructions only go down NEON pipeline when executed on CortexA8.
-    if (Domain & ARMII::DomainNEONA8)
-      return isA8;
-    return true;
-  }
-  return false;
+  return (Domain & ARMII::DomainNEON) ||
+    (isA8 && (Domain & ARMII::DomainNEONA8));
 }
 
 bool NEONMoveFixPass::InsertMoves(MachineBasicBlock &MBB) {