diff --git a/mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp b/mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp
--- a/mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp
+++ b/mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp
@@ -22,52 +22,25 @@
 // Straightforward Op Lowerings
 //===----------------------------------------------------------------------===//
 
+using AddFOpLowering = VectorConvertToLLVMPattern<arith::AddFOp, LLVM::FAddOp>;
 using AddIOpLowering = VectorConvertToLLVMPattern<arith::AddIOp, LLVM::AddOp>;
-using SubIOpLowering = VectorConvertToLLVMPattern<arith::SubIOp, LLVM::SubOp>;
-using MulIOpLowering = VectorConvertToLLVMPattern<arith::MulIOp, LLVM::MulOp>;
-using DivUIOpLowering =
-    VectorConvertToLLVMPattern<arith::DivUIOp, LLVM::UDivOp>;
-using DivSIOpLowering =
-    VectorConvertToLLVMPattern<arith::DivSIOp, LLVM::SDivOp>;
-using RemUIOpLowering =
-    VectorConvertToLLVMPattern<arith::RemUIOp, LLVM::URemOp>;
-using RemSIOpLowering =
-    VectorConvertToLLVMPattern<arith::RemSIOp, LLVM::SRemOp>;
 using AndIOpLowering = VectorConvertToLLVMPattern<arith::AndIOp, LLVM::AndOp>;
-using OrIOpLowering = VectorConvertToLLVMPattern<arith::OrIOp, LLVM::OrOp>;
-using XOrIOpLowering = VectorConvertToLLVMPattern<arith::XOrIOp, LLVM::XOrOp>;
-using ShLIOpLowering = VectorConvertToLLVMPattern<arith::ShLIOp, LLVM::ShlOp>;
-using ShRUIOpLowering =
-    VectorConvertToLLVMPattern<arith::ShRUIOp, LLVM::LShrOp>;
-using ShRSIOpLowering =
-    VectorConvertToLLVMPattern<arith::ShRSIOp, LLVM::AShrOp>;
-using NegFOpLowering = VectorConvertToLLVMPattern<arith::NegFOp, LLVM::FNegOp>;
-using AddFOpLowering = VectorConvertToLLVMPattern<arith::AddFOp, LLVM::FAddOp>;
-using SubFOpLowering = VectorConvertToLLVMPattern<arith::SubFOp, LLVM::FSubOp>;
-using MulFOpLowering = VectorConvertToLLVMPattern<arith::MulFOp, LLVM::FMulOp>;
+using BitcastOpLowering =
+    VectorConvertToLLVMPattern<arith::BitcastOp, LLVM::BitcastOp>;
 using DivFOpLowering = VectorConvertToLLVMPattern<arith::DivFOp, LLVM::FDivOp>;
-using RemFOpLowering = VectorConvertToLLVMPattern<arith::RemFOp, LLVM::FRemOp>;
-using ExtUIOpLowering =
-    VectorConvertToLLVMPattern<arith::ExtUIOp, LLVM::ZExtOp>;
+using DivSIOpLowering =
+    VectorConvertToLLVMPattern<arith::DivSIOp, LLVM::SDivOp>;
+using DivUIOpLowering =
+    VectorConvertToLLVMPattern<arith::DivUIOp, LLVM::UDivOp>;
+using ExtFOpLowering = VectorConvertToLLVMPattern<arith::ExtFOp, LLVM::FPExtOp>;
 using ExtSIOpLowering =
     VectorConvertToLLVMPattern<arith::ExtSIOp, LLVM::SExtOp>;
-using ExtFOpLowering = VectorConvertToLLVMPattern<arith::ExtFOp, LLVM::FPExtOp>;
-using TruncIOpLowering =
-    VectorConvertToLLVMPattern<arith::TruncIOp, LLVM::TruncOp>;
-using TruncFOpLowering =
-    VectorConvertToLLVMPattern<arith::TruncFOp, LLVM::FPTruncOp>;
-using UIToFPOpLowering =
-    VectorConvertToLLVMPattern<arith::UIToFPOp, LLVM::UIToFPOp>;
-using SIToFPOpLowering =
-    VectorConvertToLLVMPattern<arith::SIToFPOp, LLVM::SIToFPOp>;
-using FPToUIOpLowering =
-    VectorConvertToLLVMPattern<arith::FPToUIOp, LLVM::FPToUIOp>;
+using ExtUIOpLowering =
+    VectorConvertToLLVMPattern<arith::ExtUIOp, LLVM::ZExtOp>;
 using FPToSIOpLowering =
     VectorConvertToLLVMPattern<arith::FPToSIOp, LLVM::FPToSIOp>;
-using BitcastOpLowering =
-    VectorConvertToLLVMPattern<arith::BitcastOp, LLVM::BitcastOp>;
-using SelectOpLowering =
-    VectorConvertToLLVMPattern<arith::SelectOp, LLVM::SelectOp>;
+using FPToUIOpLowering =
+    VectorConvertToLLVMPattern<arith::FPToUIOp, LLVM::FPToUIOp>;
 using MaxFOpLowering =
     VectorConvertToLLVMPattern<arith::MaxFOp, LLVM::MaxNumOp>;
 using MaxSIOpLowering =
@@ -80,6 +53,33 @@
     VectorConvertToLLVMPattern<arith::MinSIOp, LLVM::SMinOp>;
 using MinUIOpLowering =
     VectorConvertToLLVMPattern<arith::MinUIOp, LLVM::UMinOp>;
+using MulFOpLowering = VectorConvertToLLVMPattern<arith::MulFOp, LLVM::FMulOp>;
+using MulIOpLowering = VectorConvertToLLVMPattern<arith::MulIOp, LLVM::MulOp>;
+using NegFOpLowering = VectorConvertToLLVMPattern<arith::NegFOp, LLVM::FNegOp>;
+using OrIOpLowering = VectorConvertToLLVMPattern<arith::OrIOp, LLVM::OrOp>;
+using RemFOpLowering = VectorConvertToLLVMPattern<arith::RemFOp, LLVM::FRemOp>;
+using RemSIOpLowering =
+    VectorConvertToLLVMPattern<arith::RemSIOp, LLVM::SRemOp>;
+using RemUIOpLowering =
+    VectorConvertToLLVMPattern<arith::RemUIOp, LLVM::URemOp>;
+using SelectOpLowering =
+    VectorConvertToLLVMPattern<arith::SelectOp, LLVM::SelectOp>;
+using ShLIOpLowering = VectorConvertToLLVMPattern<arith::ShLIOp, LLVM::ShlOp>;
+using ShRSIOpLowering =
+    VectorConvertToLLVMPattern<arith::ShRSIOp, LLVM::AShrOp>;
+using ShRUIOpLowering =
+    VectorConvertToLLVMPattern<arith::ShRUIOp, LLVM::LShrOp>;
+using SIToFPOpLowering =
+    VectorConvertToLLVMPattern<arith::SIToFPOp, LLVM::SIToFPOp>;
+using SubFOpLowering = VectorConvertToLLVMPattern<arith::SubFOp, LLVM::FSubOp>;
+using SubIOpLowering = VectorConvertToLLVMPattern<arith::SubIOp, LLVM::SubOp>;
+using TruncFOpLowering =
+    VectorConvertToLLVMPattern<arith::TruncFOp, LLVM::FPTruncOp>;
+using TruncIOpLowering =
+    VectorConvertToLLVMPattern<arith::TruncIOp, LLVM::TruncOp>;
+using UIToFPOpLowering =
+    VectorConvertToLLVMPattern<arith::UIToFPOp, LLVM::UIToFPOp>;
+using XOrIOpLowering = VectorConvertToLLVMPattern<arith::XOrIOp, LLVM::XOrOp>;
 
 //===----------------------------------------------------------------------===//
 // Op Lowering Patterns
@@ -300,46 +300,46 @@
     LLVMTypeConverter &converter, RewritePatternSet &patterns) {
   // clang-format off
   patterns.add<
-    ConstantOpLowering,
+    AddFOpLowering,
     AddIOpLowering,
-    SubIOpLowering,
-    MulIOpLowering,
-    DivUIOpLowering,
-    DivSIOpLowering,
-    RemUIOpLowering,
-    RemSIOpLowering,
     AndIOpLowering,
-    OrIOpLowering,
-    XOrIOpLowering,
-    ShLIOpLowering,
-    ShRUIOpLowering,
-    ShRSIOpLowering,
-    NegFOpLowering,
-    AddFOpLowering,
-    SubFOpLowering,
-    MulFOpLowering,
+    BitcastOpLowering,
+    ConstantOpLowering,
+    CmpFOpLowering,
+    CmpIOpLowering,
     DivFOpLowering,
-    RemFOpLowering,
-    ExtUIOpLowering,
-    ExtSIOpLowering,
+    DivSIOpLowering,
+    DivUIOpLowering,
     ExtFOpLowering,
-    TruncIOpLowering,
-    TruncFOpLowering,
-    UIToFPOpLowering,
-    SIToFPOpLowering,
-    FPToUIOpLowering,
+    ExtSIOpLowering,
+    ExtUIOpLowering,
     FPToSIOpLowering,
+    FPToUIOpLowering,
     IndexCastOpLowering,
-    BitcastOpLowering,
-    CmpIOpLowering,
-    CmpFOpLowering,
-    SelectOpLowering,
     MaxFOpLowering,
-    MaxUIOpLowering,
     MaxSIOpLowering,
+    MaxUIOpLowering,
     MinFOpLowering,
+    MinSIOpLowering,
     MinUIOpLowering,
-    MinSIOpLowering
+    MulFOpLowering,
+    MulIOpLowering,
+    NegFOpLowering,
+    OrIOpLowering,
+    RemFOpLowering,
+    RemSIOpLowering,
+    RemUIOpLowering,
+    SelectOpLowering,
+    ShLIOpLowering,
+    ShRSIOpLowering,
+    ShRUIOpLowering,
+    SIToFPOpLowering,
+    SubFOpLowering,
+    SubIOpLowering,
+    TruncFOpLowering,
+    TruncIOpLowering,
+    UIToFPOpLowering,
+    XOrIOpLowering
   >(converter);
   // clang-format on
 }