From 12648b2a06e3840a42978d209f2416bb02a4ad90 Mon Sep 17 00:00:00 2001
From: Thomas Lively <tlively@google.com>
Date: Thu, 15 Nov 2018 03:38:59 +0000
Subject: [PATCH] [WebAssembly] Renumber SIMD bitwise instructions

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

Reviewers: aheejin

Subscribers: dschuff, sbc100, jgravelle-google, sunfish, llvm-commits

Differential Revision: https://reviews.llvm.org/D54561

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@346931 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/WebAssembly/WebAssemblyInstrSIMD.td | 14 +++++++-------
 test/MC/WebAssembly/simd-encodings.s           | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td b/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td
index 56d277ef912..7ac2d15c295 100644
--- a/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td
+++ b/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td
@@ -559,17 +559,17 @@ multiclass SIMDUnary<ValueType vec_t, string vec, SDNode node, string name,
                         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 :
diff --git a/test/MC/WebAssembly/simd-encodings.s b/test/MC/WebAssembly/simd-encodings.s
index ac3a581e868..abb033ca215 100644
--- a/test/MC/WebAssembly/simd-encodings.s
+++ b/test/MC/WebAssembly/simd-encodings.s
@@ -226,18 +226,18 @@
     # 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
 
-- 
2.11.0