Index: lib/Target/X86/Unsupported.td
===================================================================
--- lib/Target/X86/Unsupported.td
+++ lib/Target/X86/Unsupported.td
@@ -0,0 +1,32 @@
+//=- X86ScheduleBtVer2.td - X86 BtVer2 (Jaguar) Scheduling ---*- tablegen -*-=//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines instructions which are not supported on some CPUs but should be
+// described inside the machine model
+//
+//===----------------------------------------------------------------------===//
+
+////////////////////////////////////////////////////////////////////////////////
+// AVX2 - unsupported on Jaguar and others...
+////////////////////////////////////////////////////////////////////////////////
+
+defm : UnsupportedWriteResPair<WriteFShuffle256>;
+defm : UnsupportedWriteResPair<WriteFVarShuffle256>;
+defm : UnsupportedWriteResPair<WriteShuffle256>;
+defm : UnsupportedWriteResPair< WriteVarShuffle256>;
+defm : UnsupportedWriteResPair<WriteVarVecShift>;
+defm : UnsupportedWriteResPair<WriteVarVecShiftY>;
+
+////////////////////////////////////////////////////////////////////////////////
+// FMA - unsupported on Jaguar and others...
+////////////////////////////////////////////////////////////////////////////////
+
+defm : UnsupportedWriteResPair<WriteFMA>;
+defm : UnsupportedWriteResPair<WriteFMAX>;
+defm : UnsupportedWriteResPair<WriteFMAY>;
Index: lib/Target/X86/X86Schedule.td
===================================================================
--- lib/Target/X86/X86Schedule.td
+++ lib/Target/X86/X86Schedule.td
@@ -49,6 +49,11 @@
   }
 }
 
+multiclass UnsupportedWriteResPair<X86FoldableSchedWrite SchedRW> {
+  def : WriteRes<SchedRW, [] > { let Unsupported = 1;  }
+  def : WriteRes<SchedRW.Folded, []> { let Unsupported = 1;  }
+}
+
 // Multiclass that wraps X86FoldableSchedWrite for each vector width.
 class X86SchedWriteWidths<X86FoldableSchedWrite sScl,
                           X86FoldableSchedWrite s128,
Index: lib/Target/X86/X86ScheduleBtVer2.td
===================================================================
--- lib/Target/X86/X86ScheduleBtVer2.td
+++ lib/Target/X86/X86ScheduleBtVer2.td
@@ -314,9 +314,6 @@
 defm : JWriteResFpuPair<WriteFMul64,       [JFPU1, JFPM],  4, [1,2]>;
 defm : JWriteResFpuPair<WriteFMul64X,      [JFPU1, JFPM],  4, [1,2]>;
 defm : JWriteResYMMPair<WriteFMul64Y,      [JFPU1, JFPM],  4, [2,4], 2>;
-defm : JWriteResFpuPair<WriteFMA,          [JFPU1, JFPM],  2>; // NOTE: Doesn't exist on Jaguar.
-defm : JWriteResFpuPair<WriteFMAX,         [JFPU1, JFPM],  2>; // NOTE: Doesn't exist on Jaguar.
-defm : JWriteResFpuPair<WriteFMAY,         [JFPU1, JFPM],  2>; // NOTE: Doesn't exist on Jaguar.
 defm : JWriteResFpuPair<WriteDPPD,   [JFPU1, JFPM, JFPA],  9, [1, 3, 3],  3>;
 defm : JWriteResFpuPair<WriteDPPS,   [JFPU1, JFPM, JFPA], 11, [1, 3, 3],  5>;
 defm : JWriteResYMMPair<WriteDPPSY,  [JFPU1, JFPM, JFPA], 12, [2, 6, 6], 10>;
@@ -358,8 +355,6 @@
 defm : JWriteResYMMPair<WriteFBlendY,     [JFPU01, JFPX],  1, [2, 2], 2>;
 defm : JWriteResFpuPair<WriteFVarBlend,   [JFPU01, JFPX],  2, [1, 4], 3>;
 defm : JWriteResYMMPair<WriteFVarBlendY,  [JFPU01, JFPX],  3, [2, 6], 6>;
-defm : JWriteResFpuPair<WriteFShuffle256, [JFPU01, JFPX],  1>;
-defm : JWriteResFpuPair<WriteFVarShuffle256, [JFPU01, JFPX],  1>; // NOTE: Doesn't exist on Jaguar.
 
 ////////////////////////////////////////////////////////////////////////////////
 // Conversions.
@@ -457,10 +452,6 @@
 defm : JWriteResFpuPair<WriteVecLogicY,   [JFPU01, JVALU], 1>; // NOTE: Doesn't exist on Jaguar.
 defm : JWriteResFpuPair<WriteVecTest,     [JFPU0, JFPA, JALU0], 3>;
 defm : JWriteResYMMPair<WriteVecTestY ,   [JFPU01, JFPX, JFPA, JALU0], 4, [2, 2, 2, 1], 3>;
-defm : JWriteResFpuPair<WriteShuffle256,  [JFPU01, JVALU], 1>;
-defm : JWriteResFpuPair<WriteVarShuffle256, [JFPU01, JVALU], 1>; // NOTE: Doesn't exist on Jaguar.
-defm : JWriteResFpuPair<WriteVarVecShift, [JFPU01, JVALU], 1>; // NOTE: Doesn't exist on Jaguar.
-defm : JWriteResFpuPair<WriteVarVecShiftY,[JFPU01, JVALU], 1>; // NOTE: Doesn't exist on Jaguar.
 
 ////////////////////////////////////////////////////////////////////////////////
 // Vector insert/extract operations.
@@ -578,4 +569,8 @@
 
 def : InstRW<[JWriteVZeroIdiom], (instrs PXORrr, VPXORrr)>;
 
+// Get unsupported resources which we are not implementing in Jaguar
+//
+include "Unsupported.td"
+
 } // SchedModel