Index: /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-call.ll
===================================================================
--- /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-call.ll
+++ /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-call.ll
@@ -1,4 +1,8 @@
-; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
+; FIXME: FastISel currently returns false if it hits code that uses VSX registers and
+;  with -fast-isel-abort turned on the test case will then fail.  When fastisel better
+;  supports VSX fix up this test case.
+;
+; RUN: llc < %s -O0 -verify-machineinstrs -mattr=-vsx -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
 
 define i32 @t1(i8 signext %a) nounwind {
   %1 = sext i8 %a to i32
Index: /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-cmp-imm.ll
===================================================================
--- /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-cmp-imm.ll
+++ /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-cmp-imm.ll
@@ -1,5 +1,8 @@
-; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
-
+; FIXME: FastISel currently returns false if it hits code that uses VSX registers and
+;  with -fast-isel-abort turned on the test case will then fail.  When fastisel better
+;  supports VSX fix up this test case.
+;
+; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 -mattr=-vsx | FileCheck %s --check-prefix=ELF64
 define void @t1a(float %a) uwtable ssp {
 entry:
 ; ELF64: t1a
Index: /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-conversion.ll
===================================================================
--- /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-conversion.ll
+++ /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-conversion.ll
@@ -1,5 +1,9 @@
-; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
-; RUN: llc < %s -O0 -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -mcpu=970 | FileCheck %s --check-prefix=PPC970
+; FIXME: FastISel currently returns false if it hits code that uses VSX registers and
+;  with -fast-isel-abort turned on the test case will then fail.  When fastisel better
+;  supports VSX fix up this test case.
+;
+; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 -mattr=-vsx | FileCheck %s --check-prefix=ELF64
+; RUN: llc < %s -O0 -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -mcpu=970 -mattr=-vsx | FileCheck %s --check-prefix=PPC970
 
 ;; Tests for 970 don't use -fast-isel-abort because we intentionally punt
 ;; to SelectionDAG in some cases.
Index: /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-load-store.ll
===================================================================
--- /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-load-store.ll
+++ /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-load-store.ll
@@ -1,4 +1,8 @@
-; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
+; FIXME: FastISel currently returns false if it hits code that uses VSX registers and
+;  with -fast-isel-abort turned on the test case will then fail.  When fastisel better
+;  supports VSX fix up this test case.
+;
+; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel -fast-isel-abort -mattr=-vsx -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
 
 ; This test verifies that load/store instructions are properly generated,
 ; and that they pass MI verification.
Index: /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-ret.ll
===================================================================
--- /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-ret.ll
+++ /home/seurer/llvm/llvm-oneoff/test/CodeGen/PowerPC/fast-isel-ret.ll
@@ -1,4 +1,8 @@
-; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
+; FIXME: FastISel currently returns false if it hits code that uses VSX registers and
+;  with -fast-isel-abort turned on the test case will then fail.  When fastisel better
+;  supports VSX fix up this test case.
+;
+; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 -mattr=-vsx | FileCheck %s --check-prefix=ELF64
 
 define zeroext i1 @rettrue() nounwind uwtable ssp {
 entry: