[WebAssembly] Renumber SIMD bitwise instructions

[tlively]

Summary

Changed to match https://github.com/WebAssembly/simd/pull/54.

llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td

multiclass SIMDUnary<ValueType vec_t, string vec, SDNode node, string name,
                      bits<32> simdop> {
   defm _#vec_t : SIMD_I<(outs V128:$dst), (ins V128:$vec), (outs), (ins),
                         [(set (vec_t V128:$dst),
                           (vec_t (node (vec_t V128:$vec)))
                         )],
                         vec#"."#name#"\t$dst, $vec", vec#"."#name, simdop>;
 }
 
+// Bitwise logic: v128.not
+foreach vec_t = [v16i8, v8i16, v4i32, v2i64] in
+defm NOT: SIMDUnary<vec_t, "v128", vnot, "not", 76>;
+
 // Bitwise logic: v128.and / v128.or / v128.xor
 let isCommutable = 1 in {
-defm AND : SIMDBitwise<and, "and", 76>;
-defm OR : SIMDBitwise<or, "or", 77>;
-defm XOR : SIMDBitwise<xor, "xor", 78>;
+defm AND : SIMDBitwise<and, "and", 77>;
+defm OR : SIMDBitwise<or, "or", 78>;
+defm XOR : SIMDBitwise<xor, "xor", 79>;
 } // isCommutable = 1
 
-// Bitwise logic: v128.not
-foreach vec_t = [v16i8, v8i16, v4i32, v2i64] in
-defm NOT: SIMDUnary<vec_t, "v128", vnot, "not", 79>;
-
 // Bitwise select: v128.bitselect
 foreach vec_t = [v16i8, v8i16, v4i32, v2i64, v4f32, v2f64] in
   defm BITSELECT_#vec_t :
     SIMD_I<(outs V128:$dst), (ins V128:$v1, V128:$v2, V128:$c), (outs), (ins),
            [(set (vec_t V128:$dst),
              (vec_t (int_wasm_bitselect
                (vec_t V128:$c), (vec_t V128:$v1), (vec_t V128:$v2)
              ))

llvm/trunk/test/MC/WebAssembly/simd-encodings.s

# RUN: llvm-mc -show-encoding -triple=wasm32-unkown-unknown -mattr=+sign-ext,+simd128 < %s | FileCheck %s
     f64x2.gt
 
     # CHECK: f64x2.le # encoding: [0xfd,0x4a]
     f64x2.le
 
     # CHECK: f64x2.ge # encoding: [0xfd,0x4b]
     f64x2.ge
 
-    # CHECK: v128.and # encoding: [0xfd,0x4c]
+    # CHECK: v128.not # encoding: [0xfd,0x4c]
+    v128.not
+
+    # CHECK: v128.and # encoding: [0xfd,0x4d]
     v128.and
 
-    # CHECK: v128.or # encoding: [0xfd,0x4d]
+    # CHECK: v128.or # encoding: [0xfd,0x4e]
     v128.or
 
-    # CHECK: v128.xor # encoding: [0xfd,0x4e]
+    # CHECK: v128.xor # encoding: [0xfd,0x4f]
     v128.xor
 
-    # CHECK: v128.not # encoding: [0xfd,0x4f]
-    v128.not
-
     # CHECK: v128.bitselect # encoding: [0xfd,0x50]
     v128.bitselect
 
     # CHECK: i8x16.neg # encoding: [0xfd,0x51]
     i8x16.neg
 
     # CHECK: i8x16.any_true # encoding: [0xfd,0x52]
     i8x16.any_true