Use clang-format 3.8 to format VIXL

Additionally, this version of clang-format orders include directives
alphabetically which showed that the "non-const-visitor.h" header was missing
two of them.

Change-Id: Ib03407dd2046a0bb7175370685e09fb3aebe583f

3 files changed, 268 insertions, 267 deletions

diff --git a/test/aarch64/examples/test-examples.cc b/test/aarch64/examples/test-examples.cc
index 7817536a..ef44c617 100644
--- a/test/aarch64/examples/test-examples.cc
+++ b/test/aarch64/examples/test-examples.cc
@@ -25,13 +25,13 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../test-runner.h"
-#include "../test-utils-aarch64.h"
 #include "custom-disassembler.h"
 #include "examples.h"
 #include "non-const-visitor.h"
+#include "../test-utils-aarch64.h"
 
-#include "aarch64/macro-assembler-aarch64.h"
 #include "aarch64/debugger-aarch64.h"
+#include "aarch64/macro-assembler-aarch64.h"
 #include "aarch64/simulator-aarch64.h"
 #define TEST(name) TEST_(EXAMPLE_##name)
 
diff --git a/test/aarch64/test-assembler-aarch64.cc b/test/aarch64/test-assembler-aarch64.cc
index f4a3c736..22a494af 100644
--- a/test/aarch64/test-assembler-aarch64.cc
+++ b/test/aarch64/test-assembler-aarch64.cc
@@ -25,6 +25,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <sys/mman.h>
+
 #include <cfloat>
 #include <cmath>
 #include <cstdio>
diff --git a/test/aarch64/test-simulator-traces-aarch64.h b/test/aarch64/test-simulator-traces-aarch64.h
index e374b0b5..f102262c 100644
--- a/test/aarch64/test-simulator-traces-aarch64.h
+++ b/test/aarch64/test-simulator-traces-aarch64.h
@@ -76,12 +76,12 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-add-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-add-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-add-d-trace-aarch64.h"
-#include "aarch64/traces/sim-addhn2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-addhn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-addhn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-addhn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-addhn-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-addhn-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-addhn2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-addhn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-addhn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-addp-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-addp-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-addp-2s-trace-aarch64.h"
@@ -117,54 +117,54 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-clz-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-clz-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-clz-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-4h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-8b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-8h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmeq-d-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-cmeq-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-cmeq-d-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-4h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-8b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-8h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmge-d-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-cmge-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-cmge-d-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-4h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-8b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-8h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-cmgt-d-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-cmgt-d-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-cmgt-d-trace-aarch64.h"
 #include "aarch64/traces/sim-cmhi-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-cmhi-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-cmhi-2s-trace-aarch64.h"
@@ -250,36 +250,36 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-faddp-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-faddp-d-trace-aarch64.h"
 #include "aarch64/traces/sim-faddp-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmeq-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmeq-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmeq-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmeq-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmeq-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmeq-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmeq-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmeq-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmeq-d-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmeq-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmeq-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmeq-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmeq-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmeq-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmge-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmeq-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmge-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmge-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmge-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmge-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmge-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmge-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmge-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmge-d-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmge-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmge-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmge-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmge-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmge-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmgt-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmge-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmgt-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmgt-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmgt-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmgt-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmgt-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmgt-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmgt-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmgt-d-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmgt-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmgt-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-fcmgt-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmgt-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmgt-s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-fcmgt-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmle-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmle-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-fcmle-4s-2opimm-trace-aarch64.h"
@@ -314,10 +314,10 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-fcvtau-ws-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtau-xd-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtau-xs-trace-aarch64.h"
-#include "aarch64/traces/sim-fcvtl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-fcvtl2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtl-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcvtl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-fcvtl2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtms-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtms-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtms-4s-trace-aarch64.h"
@@ -336,10 +336,10 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-fcvtmu-ws-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtmu-xd-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtmu-xs-trace-aarch64.h"
-#include "aarch64/traces/sim-fcvtn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-fcvtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtn-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-fcvtn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fcvtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtns-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtns-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtns-4s-trace-aarch64.h"
@@ -368,9 +368,9 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-fcvtpu-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtpu-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtpu-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fcvtxn2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtxn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtxn-scalar-trace-aarch64.h"
+#include "aarch64/traces/sim-fcvtxn2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtzs-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtzs-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-fcvtzs-4s-2opimm-trace-aarch64.h"
@@ -440,46 +440,46 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-fminp-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fminp-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fminv-s-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmla-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmla-2d-2d-d-trace-aarch64.h"
-#include "aarch64/traces/sim-fmla-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmla-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmla-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmla-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmla-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmla-4s-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmla-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmla-d-d-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmla-s-s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmls-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmls-2d-2d-d-trace-aarch64.h"
-#include "aarch64/traces/sim-fmls-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmls-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmls-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmls-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmls-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmls-4s-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmls-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmls-d-d-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmls-s-s-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmov-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmov-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmsub-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmsub-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmul-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmul-2d-2d-d-trace-aarch64.h"
-#include "aarch64/traces/sim-fmul-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmul-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmul-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmul-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmul-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmul-4s-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmul-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmul-d-d-d-trace-aarch64.h"
-#include "aarch64/traces/sim-fmul-s-s-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmul-d-trace-aarch64.h"
+#include "aarch64/traces/sim-fmul-s-s-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmul-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmulx-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmulx-2d-2d-d-trace-aarch64.h"
-#include "aarch64/traces/sim-fmulx-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmulx-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmulx-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmulx-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmulx-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmulx-4s-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-fmulx-d-trace-aarch64.h"
+#include "aarch64/traces/sim-fmulx-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-fmulx-d-d-d-trace-aarch64.h"
-#include "aarch64/traces/sim-fmulx-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmulx-d-trace-aarch64.h"
 #include "aarch64/traces/sim-fmulx-s-s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-fmulx-s-trace-aarch64.h"
 #include "aarch64/traces/sim-fneg-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-fneg-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-fneg-4s-trace-aarch64.h"
@@ -563,35 +563,35 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-ins-h-trace-aarch64.h"
 #include "aarch64/traces/sim-ins-s-trace-aarch64.h"
 #include "aarch64/traces/sim-mla-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-mla-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-mla-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-mla-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-mla-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-mla-4h-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-mla-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-mla-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-mla-4s-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-mla-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-mla-8b-trace-aarch64.h"
-#include "aarch64/traces/sim-mla-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-mla-8h-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-mla-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-mls-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-mls-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-mls-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-mls-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-mls-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-mls-4h-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-mls-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-mls-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-mls-4s-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-mls-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-mls-8b-trace-aarch64.h"
-#include "aarch64/traces/sim-mls-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-mls-8h-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-mls-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-mul-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-mul-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-mul-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-mul-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-mul-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-mul-4h-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-mul-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-mul-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-mul-4s-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-mul-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-mul-8b-trace-aarch64.h"
-#include "aarch64/traces/sim-mul-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-mul-8h-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-mul-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-neg-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-neg-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-neg-2s-trace-aarch64.h"
@@ -608,14 +608,14 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-orr-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-pmul-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-pmul-8b-trace-aarch64.h"
-#include "aarch64/traces/sim-pmull2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-pmull-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-raddhn2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-raddhn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-raddhn2-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-pmull2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-raddhn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-raddhn-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-raddhn-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-raddhn2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-raddhn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-raddhn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-rbit-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-rbit-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-rev16-16b-trace-aarch64.h"
@@ -630,54 +630,54 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-rev64-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-rev64-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-rev64-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-rshrn2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-rshrn2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-rshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-rshrn-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-rshrn-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-rshrn-8b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-rsubhn2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-rsubhn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-rsubhn2-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-rshrn2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-rshrn2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-rshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-rsubhn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-rsubhn-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-rsubhn-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-rsubhn2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-rsubhn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-rsubhn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-saba-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-saba-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-saba-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-saba-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-saba-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-saba-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-sabal2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-sabal2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-sabal2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sabal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sabal-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sabal-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-sabal2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sabal2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sabal2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sabd-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-sabd-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sabd-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sabd-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sabd-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-sabd-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-sabdl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-sabdl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-sabdl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sabdl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sabdl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sabdl-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-sabdl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sabdl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sabdl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sadalp-1d-trace-aarch64.h"
 #include "aarch64/traces/sim-sadalp-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sadalp-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sadalp-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sadalp-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sadalp-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-saddl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-saddl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-saddl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-saddl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-saddl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-saddl-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-saddl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-saddl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-saddl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-saddlp-1d-trace-aarch64.h"
 #include "aarch64/traces/sim-saddlp-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-saddlp-2s-trace-aarch64.h"
@@ -689,12 +689,12 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-saddlv-h-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-saddlv-s-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-saddlv-s-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-saddw2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-saddw2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-saddw2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-saddw-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-saddw-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-saddw-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-saddw2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-saddw2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-saddw2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-scvtf-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-scvtf-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-scvtf-4s-2opimm-trace-aarch64.h"
@@ -714,18 +714,18 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-shl-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shl-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shl-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-shll2-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-shll2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-shll2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shll-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shll-4s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shll-8h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-shrn2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-shrn2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-shrn2-8h-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-shll2-2d-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-shll2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-shll2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shrn-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shrn-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shrn-8b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-shrn2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-shrn2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-shrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-shsub-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-shsub-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-shsub-4h-trace-aarch64.h"
@@ -774,36 +774,36 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sminv-h-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sminv-h-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sminv-s-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-smlal2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-smlal2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-smlal2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-smlal2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-smlal2-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-smlal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-smlal-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-smlal-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-smlal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-smlal-4s-4h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-smlal-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-smlal-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-smlsl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-smlsl2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-smlsl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-smlsl2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-smlsl2-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-smlsl-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-smlal2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-smlal2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-smlal2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-smlal2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-smlal2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-smlsl-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-smlsl-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-smlsl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-smlsl-4s-4h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-smlsl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-smlsl-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-smull2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-smull2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-smull2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-smull2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-smull2-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-smull-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-smlsl2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-smlsl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-smlsl2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-smlsl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-smlsl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-smull-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-smull-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-smull-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-smull-4s-4h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-smull-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-smull-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-smull2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-smull2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-smull2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-smull2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-smull2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqabs-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqabs-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqabs-2s-trace-aarch64.h"
@@ -826,54 +826,54 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sqadd-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqadd-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqadd-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlal-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlal-4s-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal-d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlal-d-s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlal-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlal-s-h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlal2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlsl-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlsl-4s-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl-d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlsl-d-s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmlsl-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmlsl-s-h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmulh-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmlsl2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmulh-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmulh-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmulh-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmulh-4h-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmulh-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmulh-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmulh-4s-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmulh-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmulh-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmulh-8h-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmulh-h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmulh-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmulh-h-h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmulh-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmulh-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmulh-s-s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmulh-s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmull-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmull-4s-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull-d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmull-d-s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqdmull-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqdmull-s-h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqdmull2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqneg-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqneg-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqneg-2s-trace-aarch64.h"
@@ -885,18 +885,18 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sqneg-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqneg-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqneg-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrdmulh-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrdmulh-2s-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrdmulh-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrdmulh-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrdmulh-4h-4h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrdmulh-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrdmulh-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrdmulh-4s-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrdmulh-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrdmulh-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrdmulh-8h-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrdmulh-h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrdmulh-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrdmulh-h-h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrdmulh-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrdmulh-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrdmulh-s-s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrdmulh-s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshl-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshl-2s-trace-aarch64.h"
@@ -908,46 +908,46 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sqrshl-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshl-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshl-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrshrn2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrshrn2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrn-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrn-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrn-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrn-b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrn-h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrn-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrshrun2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrshrun2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqrshrun2-8h-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrshrn2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrshrn2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrun-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrun-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrun-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrun-b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrun-h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqrshrun-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrshrun2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrshrun2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqrshrun2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-4h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-8b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-8h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-b-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-d-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshl-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshl-s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshl-s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshlu-16b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshlu-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshlu-2s-2opimm-trace-aarch64.h"
@@ -959,24 +959,24 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sqshlu-d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshlu-h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshlu-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshrn2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshrn2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrn-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrn-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrn-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrn-b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrn-h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrn-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshrun2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshrun2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sqshrun2-8h-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshrn2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshrn2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrun-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrun-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrun-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrun-b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrun-h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqshrun-s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshrun2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshrun2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sqshrun2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sqsub-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqsub-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqsub-2s-trace-aarch64.h"
@@ -988,24 +988,24 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sqsub-d-trace-aarch64.h"
 #include "aarch64/traces/sim-sqsub-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqsub-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqxtn2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-sqxtn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqxtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtn-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtn-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtn-b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtn-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtn-s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqxtun2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-sqxtun2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-sqxtun2-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-sqxtn2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-sqxtn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqxtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtun-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtun-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtun-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtun-b-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtun-h-trace-aarch64.h"
 #include "aarch64/traces/sim-sqxtun-s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqxtun2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-sqxtun2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-sqxtun2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-srhadd-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-srhadd-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-srhadd-4h-trace-aarch64.h"
@@ -1052,12 +1052,12 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sshl-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-sshl-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sshl-d-trace-aarch64.h"
-#include "aarch64/traces/sim-sshll2-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sshll2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-sshll2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sshll-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sshll-4s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sshll-8h-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sshll2-2d-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sshll2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-sshll2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sshr-16b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sshr-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-sshr-2s-2opimm-trace-aarch64.h"
@@ -1074,18 +1074,18 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-ssra-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ssra-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ssra-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-ssubl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-ssubl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-ssubl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-ssubl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-ssubl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-ssubl-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-ssubw2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-ssubw2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-ssubw2-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-ssubl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-ssubl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-ssubl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-ssubw-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-ssubw-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-ssubw-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-ssubw2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-ssubw2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-ssubw2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sub-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-sub-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-sub-2s-trace-aarch64.h"
@@ -1094,12 +1094,12 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-sub-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-sub-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-sub-d-trace-aarch64.h"
-#include "aarch64/traces/sim-subhn2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-subhn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-subhn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-subhn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-subhn-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-subhn-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-subhn2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-subhn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-subhn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-suqadd-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-suqadd-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-suqadd-2s-trace-aarch64.h"
@@ -1131,36 +1131,36 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-uaba-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uaba-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-uaba-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-uabal2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-uabal2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-uabal2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uabal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uabal-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uabal-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-uabal2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-uabal2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-uabal2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uabd-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-uabd-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-uabd-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-uabd-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uabd-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-uabd-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-uabdl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-uabdl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-uabdl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uabdl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uabdl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uabdl-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-uabdl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-uabdl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-uabdl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uadalp-1d-trace-aarch64.h"
 #include "aarch64/traces/sim-uadalp-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uadalp-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-uadalp-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-uadalp-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uadalp-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-uaddl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-uaddl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-uaddl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddl-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-uaddl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-uaddl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-uaddl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddlp-1d-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddlp-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddlp-2s-trace-aarch64.h"
@@ -1172,12 +1172,12 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-uaddlv-h-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddlv-s-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddlv-s-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-uaddw2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-uaddw2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-uaddw2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddw-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddw-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uaddw-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-uaddw2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-uaddw2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-uaddw2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-ucvtf-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ucvtf-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ucvtf-4s-2opimm-trace-aarch64.h"
@@ -1229,36 +1229,36 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-uminv-h-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-uminv-h-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uminv-s-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-umlal2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-umlal2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-umlal2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-umlal2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-umlal2-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-umlal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-umlal-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-umlal-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-umlal-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-umlal-4s-4h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-umlal-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-umlal-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-umlsl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-umlsl2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-umlsl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-umlsl2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-umlsl2-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-umlsl-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-umlal2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-umlal2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-umlal2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-umlal2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-umlal2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-umlsl-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-umlsl-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-umlsl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-umlsl-4s-4h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-umlsl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-umlsl-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-umull2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-umull2-2d-4s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-umull2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-umull2-4s-8h-h-trace-aarch64.h"
-#include "aarch64/traces/sim-umull2-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-umull-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-umlsl2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-umlsl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-umlsl2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-umlsl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-umlsl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-umull-2d-2s-s-trace-aarch64.h"
-#include "aarch64/traces/sim-umull-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-umull-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-umull-4s-4h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-umull-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-umull-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-umull2-2d-4s-s-trace-aarch64.h"
+#include "aarch64/traces/sim-umull2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-umull2-4s-8h-h-trace-aarch64.h"
+#include "aarch64/traces/sim-umull2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-umull2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqadd-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqadd-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uqadd-2s-trace-aarch64.h"
@@ -1278,46 +1278,46 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-uqrshl-d-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshl-h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshl-s-trace-aarch64.h"
-#include "aarch64/traces/sim-uqrshrn2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqrshrn2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqrshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshrn-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshrn-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshrn-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshrn-b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshrn-h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqrshrn-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-uqrshrn2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-uqrshrn2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-uqrshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-2s-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-2s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-4h-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-4h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-8b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-8h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-b-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-d-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-h-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-d-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-h-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshl-s-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshl-s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshrn2-16b-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshrn2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-uqshrn2-8h-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshl-s-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshrn-2s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshrn-4h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshrn-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshrn-b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshrn-h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqshrn-s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshrn2-16b-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshrn2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-uqshrn2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-uqsub-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqsub-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uqsub-2s-trace-aarch64.h"
@@ -1326,15 +1326,15 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-uqsub-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqsub-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqsub-d-trace-aarch64.h"
-#include "aarch64/traces/sim-uqxtn2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-uqxtn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-uqxtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqxtn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-uqxtn-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqxtn-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqxtn-b-trace-aarch64.h"
 #include "aarch64/traces/sim-uqxtn-h-trace-aarch64.h"
 #include "aarch64/traces/sim-uqxtn-s-trace-aarch64.h"
+#include "aarch64/traces/sim-uqxtn2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-uqxtn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-uqxtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-urecpe-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-urecpe-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-urhadd-16b-trace-aarch64.h"
@@ -1377,12 +1377,12 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-ushl-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-ushl-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-ushl-d-trace-aarch64.h"
-#include "aarch64/traces/sim-ushll2-2d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-ushll2-4s-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-ushll2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ushll-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ushll-4s-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ushll-8h-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-ushll2-2d-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-ushll2-4s-2opimm-trace-aarch64.h"
+#include "aarch64/traces/sim-ushll2-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ushr-16b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ushr-2d-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-ushr-2s-2opimm-trace-aarch64.h"
@@ -1410,18 +1410,18 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-usra-8b-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-usra-8h-2opimm-trace-aarch64.h"
 #include "aarch64/traces/sim-usra-d-2opimm-trace-aarch64.h"
-#include "aarch64/traces/sim-usubl2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-usubl2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-usubl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-usubl-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-usubl-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-usubl-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-usubw2-2d-trace-aarch64.h"
-#include "aarch64/traces/sim-usubw2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-usubw2-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-usubl2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-usubl2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-usubl2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-usubw-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-usubw-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-usubw-8h-trace-aarch64.h"
+#include "aarch64/traces/sim-usubw2-2d-trace-aarch64.h"
+#include "aarch64/traces/sim-usubw2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-usubw2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-uzp1-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-uzp1-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-uzp1-2s-trace-aarch64.h"
@@ -1436,12 +1436,12 @@ const size_t kExpectedCount_dummy_32 = 0;
 #include "aarch64/traces/sim-uzp2-4s-trace-aarch64.h"
 #include "aarch64/traces/sim-uzp2-8b-trace-aarch64.h"
 #include "aarch64/traces/sim-uzp2-8h-trace-aarch64.h"
-#include "aarch64/traces/sim-xtn2-16b-trace-aarch64.h"
-#include "aarch64/traces/sim-xtn2-4s-trace-aarch64.h"
-#include "aarch64/traces/sim-xtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-xtn-2s-trace-aarch64.h"
 #include "aarch64/traces/sim-xtn-4h-trace-aarch64.h"
 #include "aarch64/traces/sim-xtn-8b-trace-aarch64.h"
+#include "aarch64/traces/sim-xtn2-16b-trace-aarch64.h"
+#include "aarch64/traces/sim-xtn2-4s-trace-aarch64.h"
+#include "aarch64/traces/sim-xtn2-8h-trace-aarch64.h"
 #include "aarch64/traces/sim-zip1-16b-trace-aarch64.h"
 #include "aarch64/traces/sim-zip1-2d-trace-aarch64.h"
 #include "aarch64/traces/sim-zip1-2s-trace-aarch64.h"