[llvm] r277549 - [WebAssembly] Remove unnecessary subtarget checks in peephole pass

[Derek Schuff via llvm-commits]

Author: dschuff
Date: Tue Aug  2 18:31:56 2016
New Revision: 277549

URL: http://llvm.org/viewvc/llvm-project?rev=277549&view=rev
Log:
[WebAssembly] Remove unnecessary subtarget checks in peephole pass

Leftover from D22686; the passes can handle all the instructions
unconditionally; only isel needs to care whether to generate them.

Modified:
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyPeephole.cpp

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyPeephole.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyPeephole.cpp?rev=277549&r1=277548&r2=277549&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyPeephole.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyPeephole.cpp Tue Aug  2 18:31:56 2016
@@ -108,8 +108,7 @@ bool WebAssemblyPeephole::runOnMachineFu
 
   MachineRegisterInfo &MRI = MF.getRegInfo();
   WebAssemblyFunctionInfo &MFI = *MF.getInfo<WebAssemblyFunctionInfo>();
-  const auto &Subtarget = MF.getSubtarget<WebAssemblySubtarget>();
-  const auto &TII = *Subtarget.getInstrInfo();
+  const auto &TII = *MF.getSubtarget<WebAssemblySubtarget>().getInstrInfo();
   const WebAssemblyTargetLowering &TLI =
       *MF.getSubtarget<WebAssemblySubtarget>().getTargetLowering();
   auto &LibInfo = getAnalysis<TargetLibraryInfoWrapperPass>().getTLI();
@@ -188,32 +187,24 @@ bool WebAssemblyPeephole::runOnMachineFu
             WebAssembly::COPY_LOCAL_F64);
         break;
       case WebAssembly::RETURN_v16i8:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v16i8,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v16i8,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_v8i16:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v8i16,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v8i16,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_v4i32:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v4i32,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v4i32,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_v4f32:
-        Changed |=
-            Subtarget.hasSIMD128() &&
-            MaybeRewriteToFallthrough(MI, MBB, MF, MFI, MRI, TII,
-                                      WebAssembly::FALLTHROUGH_RETURN_v4f32,
-                                      WebAssembly::COPY_LOCAL_V128);
+        Changed |= MaybeRewriteToFallthrough(
+            MI, MBB, MF, MFI, MRI, TII, WebAssembly::FALLTHROUGH_RETURN_v4f32,
+            WebAssembly::COPY_LOCAL_V128);
         break;
       case WebAssembly::RETURN_VOID:
         if (!DisableWebAssemblyFallthroughReturnOpt &&