diff --git a/llvm/lib/Target/PowerPC/PPCInstrInfo.td b/llvm/lib/Target/PowerPC/PPCInstrInfo.td
--- a/llvm/lib/Target/PowerPC/PPCInstrInfo.td
+++ b/llvm/lib/Target/PowerPC/PPCInstrInfo.td
@@ -2583,22 +2583,7 @@
 def FTSQRT: XForm_17a<63, 160, (outs crrc:$crD), (ins f8rc:$fB),
                       "ftsqrt $crD, $fB", IIC_FPCompare>;
 
-let Uses = [RM], mayRaiseFPException = 1 in {
-  let hasSideEffects = 0 in {
-  defm FCTIW  : XForm_26r<63, 14, (outs f8rc:$frD), (ins f8rc:$frB),
-                          "fctiw", "$frD, $frB", IIC_FPGeneral,
-                          []>;
-  defm FCTIWU  : XForm_26r<63, 142, (outs f8rc:$frD), (ins f8rc:$frB),
-                          "fctiwu", "$frD, $frB", IIC_FPGeneral,
-                          []>;
-  defm FCTIWZ : XForm_26r<63, 15, (outs f8rc:$frD), (ins f8rc:$frB),
-                          "fctiwz", "$frD, $frB", IIC_FPGeneral,
-                          [(set f64:$frD, (PPCfctiwz f64:$frB))]>;
-
-  defm FRSP   : XForm_26r<63, 12, (outs f4rc:$frD), (ins f8rc:$frB),
-                          "frsp", "$frD, $frB", IIC_FPGeneral,
-                          [(set f32:$frD, (any_fpround f64:$frB))]>;
-
+let mayRaiseFPException = 1, hasSideEffects = 0 in {
   let Interpretation64Bit = 1, isCodeGenOnly = 1 in
   defm FRIND  : XForm_26r<63, 392, (outs f8rc:$frD), (ins f8rc:$frB),
                           "frin", "$frD, $frB", IIC_FPGeneral,
@@ -2606,9 +2591,7 @@
   defm FRINS  : XForm_26r<63, 392, (outs f4rc:$frD), (ins f4rc:$frB),
                           "frin", "$frD, $frB", IIC_FPGeneral,
                           [(set f32:$frD, (any_fround f32:$frB))]>;
-  }
 
-  let hasSideEffects = 0 in {
   let Interpretation64Bit = 1, isCodeGenOnly = 1 in
   defm FRIPD  : XForm_26r<63, 456, (outs f8rc:$frD), (ins f8rc:$frB),
                           "frip", "$frD, $frB", IIC_FPGeneral,
@@ -2616,6 +2599,7 @@
   defm FRIPS  : XForm_26r<63, 456, (outs f4rc:$frD), (ins f4rc:$frB),
                           "frip", "$frD, $frB", IIC_FPGeneral,
                           [(set f32:$frD, (any_fceil f32:$frB))]>;
+
   let Interpretation64Bit = 1, isCodeGenOnly = 1 in
   defm FRIZD  : XForm_26r<63, 424, (outs f8rc:$frD), (ins f8rc:$frB),
                           "friz", "$frD, $frB", IIC_FPGeneral,
@@ -2623,6 +2607,7 @@
   defm FRIZS  : XForm_26r<63, 424, (outs f4rc:$frD), (ins f4rc:$frB),
                           "friz", "$frD, $frB", IIC_FPGeneral,
                           [(set f32:$frD, (any_ftrunc f32:$frB))]>;
+
   let Interpretation64Bit = 1, isCodeGenOnly = 1 in
   defm FRIMD  : XForm_26r<63, 488, (outs f8rc:$frD), (ins f8rc:$frB),
                           "frim", "$frD, $frB", IIC_FPGeneral,
@@ -2630,6 +2615,22 @@
   defm FRIMS  : XForm_26r<63, 488, (outs f4rc:$frD), (ins f4rc:$frB),
                           "frim", "$frD, $frB", IIC_FPGeneral,
                           [(set f32:$frD, (any_ffloor f32:$frB))]>;
+}
+
+let Uses = [RM], mayRaiseFPException = 1, hasSideEffects = 0 in {
+  defm FCTIW  : XForm_26r<63, 14, (outs f8rc:$frD), (ins f8rc:$frB),
+                          "fctiw", "$frD, $frB", IIC_FPGeneral,
+                          []>;
+  defm FCTIWU  : XForm_26r<63, 142, (outs f8rc:$frD), (ins f8rc:$frB),
+                          "fctiwu", "$frD, $frB", IIC_FPGeneral,
+                          []>;
+  defm FCTIWZ : XForm_26r<63, 15, (outs f8rc:$frD), (ins f8rc:$frB),
+                          "fctiwz", "$frD, $frB", IIC_FPGeneral,
+                          [(set f64:$frD, (PPCfctiwz f64:$frB))]>;
+
+  defm FRSP   : XForm_26r<63, 12, (outs f4rc:$frD), (ins f8rc:$frB),
+                          "frsp", "$frD, $frB", IIC_FPGeneral,
+                          [(set f32:$frD, (any_fpround f64:$frB))]>;
 
   defm FSQRT  : XForm_26r<63, 22, (outs f8rc:$frD), (ins f8rc:$frB),
                           "fsqrt", "$frD, $frB", IIC_FPSqrtD,
@@ -2637,8 +2638,7 @@
   defm FSQRTS : XForm_26r<59, 22, (outs f4rc:$frD), (ins f4rc:$frB),
                           "fsqrts", "$frD, $frB", IIC_FPSqrtS,
                           [(set f32:$frD, (any_fsqrt f32:$frB))]>;
-  }
-  }
+}
 }
 
 /// Note that FMR is defined as pseudo-ops on the PPC970 because they are
diff --git a/llvm/lib/Target/PowerPC/PPCInstrVSX.td b/llvm/lib/Target/PowerPC/PPCInstrVSX.td
--- a/llvm/lib/Target/PowerPC/PPCInstrVSX.td
+++ b/llvm/lib/Target/PowerPC/PPCInstrVSX.td
@@ -362,6 +362,60 @@
     }
   } // mayStore
 
+  // Rounding Instructions with static direction
+  let mayRaiseFPException = 1 in {
+    def XSRDPI : XX2Form<60, 73,
+                        (outs vsfrc:$XT), (ins vsfrc:$XB),
+                        "xsrdpi $XT, $XB", IIC_VecFP,
+                        [(set f64:$XT, (any_fround f64:$XB))]>;
+    def XSRDPIM : XX2Form<60, 121,
+                        (outs vsfrc:$XT), (ins vsfrc:$XB),
+                        "xsrdpim $XT, $XB", IIC_VecFP,
+                        [(set f64:$XT, (any_ffloor f64:$XB))]>;
+    def XSRDPIP : XX2Form<60, 105,
+                        (outs vsfrc:$XT), (ins vsfrc:$XB),
+                        "xsrdpip $XT, $XB", IIC_VecFP,
+                        [(set f64:$XT, (any_fceil f64:$XB))]>;
+    def XSRDPIZ : XX2Form<60, 89,
+                        (outs vsfrc:$XT), (ins vsfrc:$XB),
+                        "xsrdpiz $XT, $XB", IIC_VecFP,
+                        [(set f64:$XT, (any_ftrunc f64:$XB))]>;
+
+    def XVRDPI : XX2Form<60, 201,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrdpi $XT, $XB", IIC_VecFP,
+                        [(set v2f64:$XT, (any_fround v2f64:$XB))]>;
+    def XVRDPIM : XX2Form<60, 249,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrdpim $XT, $XB", IIC_VecFP,
+                        [(set v2f64:$XT, (any_ffloor v2f64:$XB))]>;
+    def XVRDPIP : XX2Form<60, 233,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrdpip $XT, $XB", IIC_VecFP,
+                        [(set v2f64:$XT, (any_fceil v2f64:$XB))]>;
+    def XVRDPIZ : XX2Form<60, 217,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrdpiz $XT, $XB", IIC_VecFP,
+                        [(set v2f64:$XT, (any_ftrunc v2f64:$XB))]>;
+
+    def XVRSPI : XX2Form<60, 137,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrspi $XT, $XB", IIC_VecFP,
+                        [(set v4f32:$XT, (any_fround v4f32:$XB))]>;
+    def XVRSPIM : XX2Form<60, 185,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrspim $XT, $XB", IIC_VecFP,
+                        [(set v4f32:$XT, (any_ffloor v4f32:$XB))]>;
+    def XVRSPIP : XX2Form<60, 169,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrspip $XT, $XB", IIC_VecFP,
+                        [(set v4f32:$XT, (any_fceil v4f32:$XB))]>;
+    def XVRSPIZ : XX2Form<60, 153,
+                        (outs vsrc:$XT), (ins vsrc:$XB),
+                        "xvrspiz $XT, $XB", IIC_VecFP,
+                        [(set v4f32:$XT, (any_ftrunc v4f32:$XB))]>;
+  } // mayRaiseException
+
   let Uses = [RM], mayRaiseFPException = 1 in {
   // Add/Mul Instructions
   let isCommutable = 1 in {
@@ -885,69 +939,21 @@
                       "xvcvuxwsp $XT, $XB", IIC_VecFP,
                       [(set v4f32:$XT, (uint_to_fp v4i32:$XB))]>;
 
-  // Rounding Instructions
-  def XSRDPI : XX2Form<60, 73,
-                      (outs vsfrc:$XT), (ins vsfrc:$XB),
-                      "xsrdpi $XT, $XB", IIC_VecFP,
-                      [(set f64:$XT, (any_fround f64:$XB))]>;
+  // Rounding Instructions respecting current rounding mode
   def XSRDPIC : XX2Form<60, 107,
                       (outs vsfrc:$XT), (ins vsfrc:$XB),
                       "xsrdpic $XT, $XB", IIC_VecFP,
                       [(set f64:$XT, (any_fnearbyint f64:$XB))]>;
-  def XSRDPIM : XX2Form<60, 121,
-                      (outs vsfrc:$XT), (ins vsfrc:$XB),
-                      "xsrdpim $XT, $XB", IIC_VecFP,
-                      [(set f64:$XT, (any_ffloor f64:$XB))]>;
-  def XSRDPIP : XX2Form<60, 105,
-                      (outs vsfrc:$XT), (ins vsfrc:$XB),
-                      "xsrdpip $XT, $XB", IIC_VecFP,
-                      [(set f64:$XT, (any_fceil f64:$XB))]>;
-  def XSRDPIZ : XX2Form<60, 89,
-                      (outs vsfrc:$XT), (ins vsfrc:$XB),
-                      "xsrdpiz $XT, $XB", IIC_VecFP,
-                      [(set f64:$XT, (any_ftrunc f64:$XB))]>;
 
-  def XVRDPI : XX2Form<60, 201,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrdpi $XT, $XB", IIC_VecFP,
-                      [(set v2f64:$XT, (any_fround v2f64:$XB))]>;
   def XVRDPIC : XX2Form<60, 235,
                       (outs vsrc:$XT), (ins vsrc:$XB),
                       "xvrdpic $XT, $XB", IIC_VecFP,
                       [(set v2f64:$XT, (any_fnearbyint v2f64:$XB))]>;
-  def XVRDPIM : XX2Form<60, 249,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrdpim $XT, $XB", IIC_VecFP,
-                      [(set v2f64:$XT, (any_ffloor v2f64:$XB))]>;
-  def XVRDPIP : XX2Form<60, 233,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrdpip $XT, $XB", IIC_VecFP,
-                      [(set v2f64:$XT, (any_fceil v2f64:$XB))]>;
-  def XVRDPIZ : XX2Form<60, 217,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrdpiz $XT, $XB", IIC_VecFP,
-                      [(set v2f64:$XT, (any_ftrunc v2f64:$XB))]>;
 
-  def XVRSPI : XX2Form<60, 137,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrspi $XT, $XB", IIC_VecFP,
-                      [(set v4f32:$XT, (any_fround v4f32:$XB))]>;
   def XVRSPIC : XX2Form<60, 171,
                       (outs vsrc:$XT), (ins vsrc:$XB),
                       "xvrspic $XT, $XB", IIC_VecFP,
                       [(set v4f32:$XT, (any_fnearbyint v4f32:$XB))]>;
-  def XVRSPIM : XX2Form<60, 185,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrspim $XT, $XB", IIC_VecFP,
-                      [(set v4f32:$XT, (any_ffloor v4f32:$XB))]>;
-  def XVRSPIP : XX2Form<60, 169,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrspip $XT, $XB", IIC_VecFP,
-                      [(set v4f32:$XT, (any_fceil v4f32:$XB))]>;
-  def XVRSPIZ : XX2Form<60, 153,
-                      (outs vsrc:$XT), (ins vsrc:$XB),
-                      "xvrspiz $XT, $XB", IIC_VecFP,
-                      [(set v4f32:$XT, (any_ftrunc v4f32:$XB))]>;
 
   // Max/Min Instructions
   let isCommutable = 1 in {