Google Git
Sign in
opensecura/sw/vec/f6f72819854c0be01168917dd1bac9f48e8fefdf^!/.
commit
f6f72819854c0be01168917dd1bac9f48e8fefdf
[log]
author
Cindy Liu <hcindyl@google.com>
Tue Sep 07 12:03:09 2021 -0700
committer
Cindy Liu <hcindyl@google.com>
Tue Sep 07 12:03:09 2021 -0700
tree
bc9f0c77f39a0a497c366b8360903c6b71c0933d
parent
632ed4383f4dcdf91f971ea7d1c0aa51a3060506 [diff]
sw:vec:vector_vset_tests: Remove illegal instructions

Change-Id: I111eaba6ff3f8d3d3184418caa941c41c773c9cd

diff --git a/vector_vset_tests/vector_vset_tests.c b/vector_vset_tests/vector_vset_tests.c
index 8ca47c7..4856b95 100644
--- a/vector_vset_tests/vector_vset_tests.c
+++ b/vector_vset_tests/vector_vset_tests.c

@@ -91,206 +91,30 @@
 
   struct subtest_s subtests[] = {
       {.vtypei = "e8",
-       .lmul = "1/8",
-       .avl = 0,
-       .expected_vl = 0,
-       .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/8",
-       .avl = 0,
-       .expected_vl = 0,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/8",
-       .avl = 0,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/8",
-      //  .avl = 0,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
-      {.vtypei = "e8",
-       .lmul = "1/8",
-       .avl = 1,
-       .expected_vl = 1,
-       .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/8",
-       .avl = 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/8",
-       .avl = 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/8",
-      //  .avl = 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
-      {.vtypei = "e8",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 3) - 1,
-       .expected_vl = (_TEST_VLENB >> 3) - 1,
-       .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 4) - 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 5) - 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/8",
-      //  .avl = (_TEST_VLENB >> 6) - 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
-      {.vtypei = "e8",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 3),
-       .expected_vl = (_TEST_VLENB >> 3),
-       .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 4),
-       .expected_vl = 0,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 5),
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/8",
-      //  .avl = (_TEST_VLENB >> 6),
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
-      {.vtypei = "e8",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 3) + 1,
-       .expected_vl = (_TEST_VLENB >> 3),
-       .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 4) + 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/8",
-       .avl = (_TEST_VLENB >> 5) + 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/8",
-      //  .avl = (_TEST_VLENB >> 6) + 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
-
-      {.vtypei = "e8",
        .lmul = "1/4",
        .avl = 0,
        .expected_vl = 0,
        .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/4",
-       .avl = 0,
-       .expected_vl = 0,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/4",
-       .avl = 0,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/4",
-      //  .avl = 0,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/4",
        .avl = 1,
        .expected_vl = 1,
        .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/4",
-       .avl = 1,
-       .expected_vl = 1,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/4",
-       .avl = 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/4",
-      //  .avl = 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/4",
        .avl = (_TEST_VLENB >> 2) - 1,
        .expected_vl = (_TEST_VLENB >> 2) - 1,
        .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/4",
-       .avl = (_TEST_VLENB >> 3) - 1,
-       .expected_vl = (_TEST_VLENB >> 3) - 1,
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/4",
-       .avl = (_TEST_VLENB >> 4) - 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/4",
-      //  .avl = (_TEST_VLENB >> 5) - 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/4",
        .avl = (_TEST_VLENB >> 2),
        .expected_vl = (_TEST_VLENB >> 2),
        .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/4",
-       .avl = (_TEST_VLENB >> 3),
-       .expected_vl = (_TEST_VLENB >> 3),
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/4",
-       .avl = (_TEST_VLENB >> 4),
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/4",
-      //  .avl = (_TEST_VLENB >> 5),
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/4",
        .avl = (_TEST_VLENB >> 2) + 1,
        .expected_vl = (_TEST_VLENB >> 2),
        .line = __LINE__},
-      {.vtypei = "e16",
-       .lmul = "1/4",
-       .avl = (_TEST_VLENB >> 3) + 1,
-       .expected_vl = (_TEST_VLENB >> 3),
-       .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/4",
-       .avl = (_TEST_VLENB >> 4) + 1,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/4",
-      //  .avl = (_TEST_VLENB >> 5) + 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
 
       {.vtypei = "e8",
        .lmul = "1/2",
@@ -302,16 +126,6 @@
        .avl = 0,
        .expected_vl = 0,
        .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/2",
-       .avl = 0,
-       .expected_vl = 0,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/2",
-      //  .avl = 0,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/2",
        .avl = 1,
@@ -322,16 +136,6 @@
        .avl = 1,
        .expected_vl = 1,
        .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/2",
-       .avl = 1,
-       .expected_vl = 1,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/2",
-      //  .avl = 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/2",
        .avl = (_TEST_VLENB >> 1) - 1,
@@ -342,16 +146,6 @@
        .avl = (_TEST_VLENB >> 2) - 1,
        .expected_vl = (_TEST_VLENB >> 2) - 1,
        .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/2",
-       .avl = (_TEST_VLENB >> 3) - 1,
-       .expected_vl = (_TEST_VLENB >> 3) - 1,
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/2",
-      //  .avl = (_TEST_VLENB >> 4) - 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/2",
        .avl = (_TEST_VLENB >> 1),
@@ -362,16 +156,6 @@
        .avl = (_TEST_VLENB >> 2),
        .expected_vl = (_TEST_VLENB >> 2),
        .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/2",
-       .avl = (_TEST_VLENB >> 3),
-       .expected_vl = (_TEST_VLENB >> 3),
-       .line = __LINE__},
-      {.vtypei = "e64",
-       .lmul = "1/2",
-       .avl = (_TEST_VLENB >> 4),
-       .expected_vl = 0,
-       .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1/2",
        .avl = (_TEST_VLENB >> 1) + 1,
@@ -382,16 +166,6 @@
        .avl = (_TEST_VLENB >> 2) + 1,
        .expected_vl = (_TEST_VLENB >> 2),
        .line = __LINE__},
-      {.vtypei = "e32",
-       .lmul = "1/2",
-       .avl = (_TEST_VLENB >> 3) + 1,
-       .expected_vl = (_TEST_VLENB >> 3),
-       .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1/2",
-      //  .avl = (_TEST_VLENB >> 4) + 1,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
 
       {.vtypei = "e8",
        .lmul = "1",
@@ -408,11 +182,6 @@
        .avl = 0,
        .expected_vl = 0,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1",
-      //  .avl = 0,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1",
        .avl = 1,
@@ -428,11 +197,6 @@
        .avl = 1,
        .expected_vl = 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1",
-      //  .avl = 1,
-      //  .expected_vl = 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1",
        .avl = (_TEST_VLENB >> 0) - 1,
@@ -448,11 +212,6 @@
        .avl = (_TEST_VLENB >> 2) - 1,
        .expected_vl = (_TEST_VLENB >> 2) - 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1",
-      //  .avl = (_TEST_VLENB >> 3) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 3) - 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1",
        .avl = (_TEST_VLENB >> 0),
@@ -468,11 +227,6 @@
        .avl = (_TEST_VLENB >> 2),
        .expected_vl = (_TEST_VLENB >> 2),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1",
-      //  .avl = (_TEST_VLENB >> 3),
-      //  .expected_vl = (_TEST_VLENB >> 3),
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "1",
        .avl = (_TEST_VLENB >> 0) + 1,
@@ -488,11 +242,6 @@
        .avl = (_TEST_VLENB >> 2) + 1,
        .expected_vl = (_TEST_VLENB >> 2),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "1",
-      //  .avl = (_TEST_VLENB >> 3) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 3),
-      //  .line = __LINE__},
 
       {.vtypei = "e8",
        .lmul = "2",
@@ -509,11 +258,6 @@
        .avl = 0,
        .expected_vl = 0,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "2",
-      //  .avl = 0,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "2",
        .avl = 1,
@@ -529,11 +273,6 @@
        .avl = 1,
        .expected_vl = 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "2",
-      //  .avl = 1,
-      //  .expected_vl = 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "2",
        .avl = (_TEST_VLENB << 1) - 1,
@@ -549,11 +288,6 @@
        .avl = (_TEST_VLENB >> 1) - 1,
        .expected_vl = (_TEST_VLENB >> 1) - 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "2",
-      //  .avl = (_TEST_VLENB >> 2) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 2) - 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "2",
        .avl = (_TEST_VLENB << 1),
@@ -569,11 +303,6 @@
        .avl = (_TEST_VLENB >> 1),
        .expected_vl = (_TEST_VLENB >> 1),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "2",
-      //  .avl = (_TEST_VLENB >> 2),
-      //  .expected_vl = (_TEST_VLENB >> 2),
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "2",
        .avl = (_TEST_VLENB << 1) + 1,
@@ -589,11 +318,6 @@
        .avl = (_TEST_VLENB >> 1) + 1,
        .expected_vl = (_TEST_VLENB >> 1),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "2",
-      //  .avl = (_TEST_VLENB >> 2) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 2),
-      //  .line = __LINE__},
 
       {.vtypei = "e8",
        .lmul = "4",
@@ -610,11 +334,6 @@
        .avl = 0,
        .expected_vl = 0,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "4",
-      //  .avl = 0,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "4",
        .avl = 1,
@@ -630,11 +349,6 @@
        .avl = 1,
        .expected_vl = 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "4",
-      //  .avl = 1,
-      //  .expected_vl = 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "4",
        .avl = (_TEST_VLENB << 2) - 1,
@@ -650,11 +364,6 @@
        .avl = (_TEST_VLENB >> 0) - 1,
        .expected_vl = (_TEST_VLENB >> 0) - 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "4",
-      //  .avl = (_TEST_VLENB >> 1) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 1) - 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "4",
        .avl = (_TEST_VLENB << 2),
@@ -670,11 +379,6 @@
        .avl = (_TEST_VLENB >> 0),
        .expected_vl = (_TEST_VLENB >> 0),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "4",
-      //  .avl = (_TEST_VLENB >> 1),
-      //  .expected_vl = (_TEST_VLENB >> 1),
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "4",
        .avl = (_TEST_VLENB << 2) + 1,
@@ -690,11 +394,6 @@
        .avl = (_TEST_VLENB >> 0) + 1,
        .expected_vl = (_TEST_VLENB >> 0),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "4",
-      //  .avl = (_TEST_VLENB >> 1) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 1),
-      //  .line = __LINE__},
 
       {.vtypei = "e8",
        .lmul = "8",
@@ -711,11 +410,6 @@
        .avl = 0,
        .expected_vl = 0,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "8",
-      //  .avl = 0,
-      //  .expected_vl = 0,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "8",
        .avl = 1,
@@ -731,11 +425,6 @@
        .avl = 1,
        .expected_vl = 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "8",
-      //  .avl = 1,
-      //  .expected_vl = 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "8",
        .avl = (_TEST_VLENB << 3) - 1,
@@ -751,11 +440,6 @@
        .avl = (_TEST_VLENB << 1) - 1,
        .expected_vl = (_TEST_VLENB << 1) - 1,
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "8",
-      //  .avl = (_TEST_VLENB >> 0) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 0) - 1,
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "8",
        .avl = (_TEST_VLENB << 3),
@@ -771,11 +455,6 @@
        .avl = (_TEST_VLENB << 1),
        .expected_vl = (_TEST_VLENB << 1),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "8",
-      //  .avl = (_TEST_VLENB >> 0),
-      //  .expected_vl = (_TEST_VLENB >> 0),
-      //  .line = __LINE__},
       {.vtypei = "e8",
        .lmul = "8",
        .avl = (_TEST_VLENB << 3) + 1,
@@ -791,11 +470,6 @@
        .avl = (_TEST_VLENB << 1) + 1,
        .expected_vl = (_TEST_VLENB << 1),
        .line = __LINE__},
-      // {.vtypei = "e64",
-      //  .lmul = "8",
-      //  .avl = (_TEST_VLENB >> 0) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 0),
-      //  .line = __LINE__},
   };
 
   uint32_t len = sizeof(subtests) / sizeof(struct subtest_s);
@@ -842,49 +516,15 @@
   VSETVLI_TEST_HELPER(vtypei, "e32,m1,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e32,m1,ta,ma", avl);
 
-  /*
-  VSETVLI_TEST_HELPER(vtypei, "e64,m1,tu,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e64,m1,tu,ma", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e64,m1,ta,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e64,m1,ta,ma", avl);
-  */
-  VSETVLI_TEST_HELPER(vtypei, "e8,mf8,ta,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e8,mf8,ta,ma", avl);
-
-  VSETVLI_TEST_HELPER(vtypei, "e16,mf8,ta,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e16,mf8,ta,ma", avl);
-
-  VSETVLI_TEST_HELPER(vtypei, "e32,mf8,ta,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e32,mf8,ta,ma", avl);
-
-  // VSETVLI_TEST_HELPER(vtypei, "e64,mf8,ta,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,mf8,ta,ma", avl);
-
   VSETVLI_TEST_HELPER(vtypei, "e8,mf4,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,mf4,ta,ma", avl);
 
-  VSETVLI_TEST_HELPER(vtypei, "e16,mf4,ta,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e16,mf4,ta,ma", avl);
-
-  VSETVLI_TEST_HELPER(vtypei, "e32,mf4,ta,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e32,mf4,ta,ma", avl);
-
-  // VSETVLI_TEST_HELPER(vtypei, "e64,mf4,ta,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,mf4,ta,ma", avl);
-
   VSETVLI_TEST_HELPER(vtypei, "e8,mf2,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,mf2,ta,ma", avl);
 
   VSETVLI_TEST_HELPER(vtypei, "e16,mf2,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e16,mf2,ta,ma", avl);
 
-  VSETVLI_TEST_HELPER(vtypei, "e32,mf2,ta,mu", avl);
-  VSETVLI_TEST_HELPER(vtypei, "e32,mf2,ta,ma", avl);
-
-  // VSETVLI_TEST_HELPER(vtypei, "e64,mf2,ta,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,mf2,ta,ma", avl);
-
-
   VSETVLI_TEST_HELPER(vtypei, "e8,m1,tu,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m1,tu,ma", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m1,ta,mu", avl);
@@ -900,11 +540,6 @@
   VSETVLI_TEST_HELPER(vtypei, "e32,m1,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e32,m1,ta,ma", avl);
 
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m1,tu,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m1,tu,ma", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m1,ta,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m1,ta,ma", avl);
-
   VSETVLI_TEST_HELPER(vtypei, "e8,m2,tu,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m2,tu,ma", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m2,ta,mu", avl);
@@ -920,11 +555,6 @@
   VSETVLI_TEST_HELPER(vtypei, "e32,m2,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e32,m2,ta,ma", avl);
 
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m2,tu,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m2,tu,ma", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m2,ta,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m2,ta,ma", avl);
-
   VSETVLI_TEST_HELPER(vtypei, "e8,m4,tu,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m4,tu,ma", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m4,ta,mu", avl);
@@ -940,11 +570,6 @@
   VSETVLI_TEST_HELPER(vtypei, "e32,m4,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e32,m4,ta,ma", avl);
 
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m4,tu,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m4,tu,ma", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m4,ta,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m4,ta,ma", avl);
-
   VSETVLI_TEST_HELPER(vtypei, "e8,m8,tu,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m8,tu,ma", avl);
   VSETVLI_TEST_HELPER(vtypei, "e8,m8,ta,mu", avl);
@@ -960,11 +585,6 @@
   VSETVLI_TEST_HELPER(vtypei, "e32,m8,ta,mu", avl);
   VSETVLI_TEST_HELPER(vtypei, "e32,m8,ta,ma", avl);
 
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m8,tu,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m8,tu,ma", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m8,ta,mu", avl);
-  // VSETVLI_TEST_HELPER(vtypei, "e64,m8,ta,ma", avl);
-
   COPY_SCALAR_REG(observed_vl);
   if (observed_vl != expected_vl) {
     LOG_INFO("Subtest failed, observed_vl = %u, expected_vl = %u", observed_vl,
@@ -982,115 +602,47 @@
   };
 
   struct subtest_s subtests[] = {
-
-      {.vtypei = "e8,mf8", .avl = 0, .expected_vl = 0},
-      {.vtypei = "e16,mf8", .avl = 0, .expected_vl = 0},
-      {.vtypei = "e32,mf8", .avl = 0, .expected_vl = 0},
-      // {.vtypei = "e64,mf8", .avl = 0, .expected_vl = 0},
-      {.vtypei = "e8,mf8", .avl = 1, .expected_vl = 1},
-      {.vtypei = "e16,mf8", .avl = 1, .expected_vl = 0},
-      {.vtypei = "e32,mf8", .avl = 1, .expected_vl = 0},
-      // {.vtypei = "e64,mf8", .avl = 1, .expected_vl = 0},
-      {.vtypei = "e8,mf8",
-       .avl = (_TEST_VLENB >> 3) - 1,
-       .expected_vl = (_TEST_VLENB >> 3) - 1},
-      {.vtypei = "e16,mf8", .avl = (_TEST_VLENB >> 4) - 1, .expected_vl = 0},
-      {.vtypei = "e32,mf8", .avl = (_TEST_VLENB >> 5) - 1, .expected_vl = 0},
-      // {.vtypei = "e64,mf8", .avl = (_TEST_VLENB >> 6) - 1, .expected_vl = 0},
-      {.vtypei = "e8,mf8",
-       .avl = (_TEST_VLENB >> 3),
-       .expected_vl = (_TEST_VLENB >> 3)},
-      {.vtypei = "e16,mf8", .avl = (_TEST_VLENB >> 4), .expected_vl = 0},
-      {.vtypei = "e32,mf8", .avl = (_TEST_VLENB >> 5), .expected_vl = 0},
-      // {.vtypei = "e64,mf8", .avl = (_TEST_VLENB >> 6), .expected_vl = 0},
-      {.vtypei = "e8,mf8",
-       .avl = (_TEST_VLENB >> 3) + 1,
-       .expected_vl = (_TEST_VLENB >> 3)},
-      {.vtypei = "e16,mf8", .avl = (_TEST_VLENB >> 4) + 1, .expected_vl = 0},
-      {.vtypei = "e32,mf8", .avl = (_TEST_VLENB >> 5) + 1, .expected_vl = 0},
-      // {.vtypei = "e64,mf8", .avl = (_TEST_VLENB >> 6) + 1, .expected_vl = 0},
-
       {.vtypei = "e8,mf4", .avl = 0, .expected_vl = 0},
-      {.vtypei = "e16,mf4", .avl = 0, .expected_vl = 0},
-      {.vtypei = "e32,mf4", .avl = 0, .expected_vl = 0},
-      // {.vtypei = "e64,mf4", .avl = 0, .expected_vl = 0},
       {.vtypei = "e8,mf4", .avl = 1, .expected_vl = 1},
-      {.vtypei = "e16,mf4", .avl = 1, .expected_vl = 1},
-      {.vtypei = "e32,mf4", .avl = 1, .expected_vl = 0},
-      // {.vtypei = "e64,mf4", .avl = 1, .expected_vl = 0},
       {.vtypei = "e8,mf4",
        .avl = (_TEST_VLENB >> 2) - 1,
        .expected_vl = (_TEST_VLENB >> 2) - 1},
-      {.vtypei = "e16,mf4",
-       .avl = (_TEST_VLENB >> 3) - 1,
-       .expected_vl = (_TEST_VLENB >> 3) - 1},
-      {.vtypei = "e32,mf4", .avl = (_TEST_VLENB >> 4) - 1, .expected_vl = 0},
-      // {.vtypei = "e64,mf4", .avl = (_TEST_VLENB >> 5) - 1, .expected_vl = 0},
       {.vtypei = "e8,mf4",
        .avl = (_TEST_VLENB >> 2),
        .expected_vl = (_TEST_VLENB >> 2)},
-      {.vtypei = "e16,mf4",
-       .avl = (_TEST_VLENB >> 3),
-       .expected_vl = (_TEST_VLENB >> 3)},
-      {.vtypei = "e32,mf4", .avl = (_TEST_VLENB >> 4), .expected_vl = 0},
-      // {.vtypei = "e64,mf4", .avl = (_TEST_VLENB >> 5), .expected_vl = 0},
       {.vtypei = "e8,mf4",
        .avl = (_TEST_VLENB >> 2) + 1,
        .expected_vl = (_TEST_VLENB >> 2)},
-      {.vtypei = "e16,mf4",
-       .avl = (_TEST_VLENB >> 3) + 1,
-       .expected_vl = (_TEST_VLENB >> 3)},
-      {.vtypei = "e32,mf4", .avl = (_TEST_VLENB >> 4) + 1, .expected_vl = 0},
-      // {.vtypei = "e64,mf4", .avl = (_TEST_VLENB >> 5) + 1, .expected_vl = 0},
 
       {.vtypei = "e8,mf2", .avl = 0, .expected_vl = 0},
       {.vtypei = "e16,mf2", .avl = 0, .expected_vl = 0},
-      {.vtypei = "e32,mf2", .avl = 0, .expected_vl = 0},
-      // {.vtypei = "e64,mf2", .avl = 0, .expected_vl = 0},
       {.vtypei = "e8,mf2", .avl = 1, .expected_vl = 1},
       {.vtypei = "e16,mf2", .avl = 1, .expected_vl = 1},
-      {.vtypei = "e32,mf2", .avl = 1, .expected_vl = 1},
-      // {.vtypei = "e64,mf2", .avl = 1, .expected_vl = 0},
       {.vtypei = "e8,mf2",
        .avl = (_TEST_VLENB >> 1) - 1,
        .expected_vl = (_TEST_VLENB >> 1) - 1},
       {.vtypei = "e16,mf2",
        .avl = (_TEST_VLENB >> 2) - 1,
        .expected_vl = (_TEST_VLENB >> 2) - 1},
-      {.vtypei = "e32,mf2",
-       .avl = (_TEST_VLENB >> 3) - 1,
-       .expected_vl = (_TEST_VLENB >> 3) - 1},
-      // {.vtypei = "e64,mf2", .avl = (_TEST_VLENB >> 4) - 1, .expected_vl = 0},
       {.vtypei = "e8,mf2",
        .avl = (_TEST_VLENB >> 1),
        .expected_vl = (_TEST_VLENB >> 1)},
       {.vtypei = "e16,mf2",
        .avl = (_TEST_VLENB >> 2),
        .expected_vl = (_TEST_VLENB >> 2)},
-      {.vtypei = "e32,mf2",
-       .avl = (_TEST_VLENB >> 3),
-       .expected_vl = (_TEST_VLENB >> 3)},
-      // {.vtypei = "e64,mf2", .avl = (_TEST_VLENB >> 4), .expected_vl = 0},
       {.vtypei = "e8,mf2",
        .avl = (_TEST_VLENB >> 1) + 1,
        .expected_vl = (_TEST_VLENB >> 1)},
       {.vtypei = "e16,mf2",
        .avl = (_TEST_VLENB >> 2) + 1,
        .expected_vl = (_TEST_VLENB >> 2)},
-      {.vtypei = "e32,mf2",
-       .avl = (_TEST_VLENB >> 3) + 1,
-       .expected_vl = (_TEST_VLENB >> 3)},
-      // {.vtypei = "e64,mf2", .avl = (_TEST_VLENB >> 4) + 1, .expected_vl = 0},
-
 
       {.vtypei = "e8,m1", .avl = 0, .expected_vl = 0},
       {.vtypei = "e16,m1", .avl = 0, .expected_vl = 0},
       {.vtypei = "e32,m1", .avl = 0, .expected_vl = 0},
-      // {.vtypei = "e64,m1", .avl = 0, .expected_vl = 0},
       {.vtypei = "e8,m1", .avl = 1, .expected_vl = 1},
       {.vtypei = "e16,m1", .avl = 1, .expected_vl = 1},
       {.vtypei = "e32,m1", .avl = 1, .expected_vl = 1},
-      // {.vtypei = "e64,m1", .avl = 1, .expected_vl = 1},
       {.vtypei = "e8,m1",
        .avl = (_TEST_VLENB >> 0) - 1,
        .expected_vl = (_TEST_VLENB >> 0) - 1},
@@ -1100,9 +652,6 @@
       {.vtypei = "e32,m1",
        .avl = (_TEST_VLENB >> 2) - 1,
        .expected_vl = (_TEST_VLENB >> 2) - 1},
-      // {.vtypei = "e64,m1",
-      //  .avl = (_TEST_VLENB >> 3) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 3) - 1},
       {.vtypei = "e8,m1",
        .avl = (_TEST_VLENB >> 0),
        .expected_vl = (_TEST_VLENB >> 0)},
@@ -1112,9 +661,6 @@
       {.vtypei = "e32,m1",
        .avl = (_TEST_VLENB >> 2),
        .expected_vl = (_TEST_VLENB >> 2)},
-      // {.vtypei = "e64,m1",
-      //  .avl = (_TEST_VLENB >> 3),
-      //  .expected_vl = (_TEST_VLENB >> 3)},
       {.vtypei = "e8,m1",
        .avl = (_TEST_VLENB >> 0) + 1,
        .expected_vl = (_TEST_VLENB >> 0)},
@@ -1124,18 +670,13 @@
       {.vtypei = "e32,m1",
        .avl = (_TEST_VLENB >> 2) + 1,
        .expected_vl = (_TEST_VLENB >> 2)},
-      // {.vtypei = "e64,m1",
-      //  .avl = (_TEST_VLENB >> 3) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 3)},
 
       {.vtypei = "e8,m2", .avl = 0, .expected_vl = 0},
       {.vtypei = "e16,m2", .avl = 0, .expected_vl = 0},
       {.vtypei = "e32,m2", .avl = 0, .expected_vl = 0},
-      // {.vtypei = "e64,m2", .avl = 0, .expected_vl = 0},
       {.vtypei = "e8,m2", .avl = 1, .expected_vl = 1},
       {.vtypei = "e16,m2", .avl = 1, .expected_vl = 1},
       {.vtypei = "e32,m2", .avl = 1, .expected_vl = 1},
-      // {.vtypei = "e64,m2", .avl = 1, .expected_vl = 1},
       {.vtypei = "e8,m2",
        .avl = (_TEST_VLENB << 1) - 1,
        .expected_vl = (_TEST_VLENB << 1) - 1},
@@ -1145,9 +686,6 @@
       {.vtypei = "e32,m2",
        .avl = (_TEST_VLENB >> 1) - 1,
        .expected_vl = (_TEST_VLENB >> 1) - 1},
-      // {.vtypei = "e64,m2",
-      //  .avl = (_TEST_VLENB >> 2) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 2) - 1},
       {.vtypei = "e8,m2",
        .avl = (_TEST_VLENB << 1),
        .expected_vl = (_TEST_VLENB << 1)},
@@ -1157,9 +695,6 @@
       {.vtypei = "e32,m2",
        .avl = (_TEST_VLENB >> 1),
        .expected_vl = (_TEST_VLENB >> 1)},
-      // {.vtypei = "e64,m2",
-      //  .avl = (_TEST_VLENB >> 2),
-      //  .expected_vl = (_TEST_VLENB >> 2)},
       {.vtypei = "e8,m2",
        .avl = (_TEST_VLENB << 1) + 1,
        .expected_vl = (_TEST_VLENB << 1)},
@@ -1169,18 +704,13 @@
       {.vtypei = "e32,m2",
        .avl = (_TEST_VLENB >> 1) + 1,
        .expected_vl = (_TEST_VLENB >> 1)},
-      // {.vtypei = "e64,m2",
-      //  .avl = (_TEST_VLENB >> 2) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 2)},
 
       {.vtypei = "e8,m4", .avl = 0, .expected_vl = 0},
       {.vtypei = "e16,m4", .avl = 0, .expected_vl = 0},
       {.vtypei = "e32,m4", .avl = 0, .expected_vl = 0},
-      // {.vtypei = "e64,m4", .avl = 0, .expected_vl = 0},
       {.vtypei = "e8,m4", .avl = 1, .expected_vl = 1},
       {.vtypei = "e16,m4", .avl = 1, .expected_vl = 1},
       {.vtypei = "e32,m4", .avl = 1, .expected_vl = 1},
-      // {.vtypei = "e64,m4", .avl = 1, .expected_vl = 1},
       {.vtypei = "e8,m4",
        .avl = (_TEST_VLENB << 2) - 1,
        .expected_vl = (_TEST_VLENB << 2) - 1},
@@ -1190,9 +720,6 @@
       {.vtypei = "e32,m4",
        .avl = (_TEST_VLENB >> 0) - 1,
        .expected_vl = (_TEST_VLENB >> 0) - 1},
-      // {.vtypei = "e64,m4",
-      //  .avl = (_TEST_VLENB >> 1) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 1) - 1},
       {.vtypei = "e8,m4",
        .avl = (_TEST_VLENB << 2),
        .expected_vl = (_TEST_VLENB << 2)},
@@ -1202,9 +729,6 @@
       {.vtypei = "e32,m4",
        .avl = (_TEST_VLENB >> 0),
        .expected_vl = (_TEST_VLENB >> 0)},
-      // {.vtypei = "e64,m4",
-      //  .avl = (_TEST_VLENB >> 1),
-      //  .expected_vl = (_TEST_VLENB >> 1)},
       {.vtypei = "e8,m4",
        .avl = (_TEST_VLENB << 2) + 1,
        .expected_vl = (_TEST_VLENB << 2)},
@@ -1214,18 +738,13 @@
       {.vtypei = "e32,m4",
        .avl = (_TEST_VLENB >> 0) + 1,
        .expected_vl = (_TEST_VLENB >> 0)},
-      // {.vtypei = "e64,m4",
-      //  .avl = (_TEST_VLENB >> 1) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 1)},
 
       {.vtypei = "e8,m8", .avl = 0, .expected_vl = 0},
       {.vtypei = "e16,m8", .avl = 0, .expected_vl = 0},
       {.vtypei = "e32,m8", .avl = 0, .expected_vl = 0},
-      // {.vtypei = "e64,m8", .avl = 0, .expected_vl = 0},
       {.vtypei = "e8,m8", .avl = 1, .expected_vl = 1},
       {.vtypei = "e16,m8", .avl = 1, .expected_vl = 1},
       {.vtypei = "e32,m8", .avl = 1, .expected_vl = 1},
-      // {.vtypei = "e64,m8", .avl = 1, .expected_vl = 1},
       {.vtypei = "e8,m8",
        .avl = (_TEST_VLENB << 3) - 1,
        .expected_vl = (_TEST_VLENB << 3) - 1},
@@ -1235,9 +754,6 @@
       {.vtypei = "e32,m8",
        .avl = (_TEST_VLENB << 1) - 1,
        .expected_vl = (_TEST_VLENB << 1) - 1},
-      // {.vtypei = "e64,m8",
-      //  .avl = (_TEST_VLENB >> 0) - 1,
-      //  .expected_vl = (_TEST_VLENB >> 0) - 1},
       {.vtypei = "e8,m8",
        .avl = (_TEST_VLENB << 3),
        .expected_vl = (_TEST_VLENB << 3)},
@@ -1247,9 +763,6 @@
       {.vtypei = "e32,m8",
        .avl = (_TEST_VLENB << 1),
        .expected_vl = (_TEST_VLENB << 1)},
-      // {.vtypei = "e64,m8",
-      //  .avl = (_TEST_VLENB >> 0),
-      //  .expected_vl = (_TEST_VLENB >> 0)},
       {.vtypei = "e8,m8",
        .avl = (_TEST_VLENB << 3) + 1,
        .expected_vl = (_TEST_VLENB << 3)},
@@ -1259,9 +772,6 @@
       {.vtypei = "e32,m8",
        .avl = (_TEST_VLENB << 1) + 1,
        .expected_vl = (_TEST_VLENB << 1)},
-      // {.vtypei = "e64,m8",
-      //  .avl = (_TEST_VLENB >> 0) + 1,
-      //  .expected_vl = (_TEST_VLENB >> 0)},
   };
 
   uint32_t len = sizeof(subtests) / sizeof(struct subtest_s);
@@ -1394,166 +904,91 @@
   // AVL immediate is 5 bits -> 31 is the max
   uint32_t subtest_count = 0;
 
-  VSETIVLI_SUBTEST(0, "e8,mf8", 0);
-  VSETIVLI_SUBTEST(0, "e16,mf8", 0);
-  VSETIVLI_SUBTEST(0, "e32,mf8", 0);
-  // VSETIVLI_SUBTEST(0, "e64,mf8", 0);
-  VSETIVLI_SUBTEST(1, "e8,mf8", 1);
-  VSETIVLI_SUBTEST(1, "e16,mf8", 0);
-  VSETIVLI_SUBTEST(1, "e32,mf8", 0);
-  // VSETIVLI_SUBTEST(1, "e64,mf8", 0);
   VSETIVLI_SUBTEST(0, "e8,mf4", 0);
-  VSETIVLI_SUBTEST(0, "e16,mf4", 0);
-  VSETIVLI_SUBTEST(0, "e32,mf4", 0);
-  // VSETIVLI_SUBTEST(0, "e64,mf4", 0);
   VSETIVLI_SUBTEST(1, "e8,mf4", 1);
-  VSETIVLI_SUBTEST(1, "e16,mf4", 1);
-  VSETIVLI_SUBTEST(1, "e32,mf4", 0);
-  // VSETIVLI_SUBTEST(1, "e64,mf4", 0);
+
   VSETIVLI_SUBTEST(0, "e8,mf2", 0);
   VSETIVLI_SUBTEST(0, "e16,mf2", 0);
-  VSETIVLI_SUBTEST(0, "e32,mf2", 0);
-  // VSETIVLI_SUBTEST(0, "e64,mf2", 0);
   VSETIVLI_SUBTEST(1, "e8,mf2", 1);
   VSETIVLI_SUBTEST(1, "e16,mf2", 1);
-  VSETIVLI_SUBTEST(1, "e32,mf2", 1);
-  // VSETIVLI_SUBTEST(1, "e64,mf2", 0);
 
   VSETIVLI_SUBTEST(0, "e8,m1", 0);
   VSETIVLI_SUBTEST(0, "e16,m1", 0);
   VSETIVLI_SUBTEST(0, "e32,m1", 0);
-  // VSETIVLI_SUBTEST(0, "e64,m1", 0);
   VSETIVLI_SUBTEST(1, "e8,m1", 1);
   VSETIVLI_SUBTEST(1, "e16,m1", 1);
   VSETIVLI_SUBTEST(1, "e32,m1", 1);
-  // VSETIVLI_SUBTEST(1, "e64,m1", 1);
   VSETIVLI_SUBTEST(0, "e8,m2", 0);
   VSETIVLI_SUBTEST(0, "e16,m2", 0);
   VSETIVLI_SUBTEST(0, "e32,m2", 0);
-  // VSETIVLI_SUBTEST(0, "e64,m2", 0);
   VSETIVLI_SUBTEST(1, "e8,m2", 1);
   VSETIVLI_SUBTEST(1, "e16,m2", 1);
   VSETIVLI_SUBTEST(1, "e32,m2", 1);
-  // VSETIVLI_SUBTEST(1, "e64,m2", 1);
   VSETIVLI_SUBTEST(0, "e8,m4", 0);
   VSETIVLI_SUBTEST(0, "e16,m4", 0);
   VSETIVLI_SUBTEST(0, "e32,m4", 0);
-  // VSETIVLI_SUBTEST(0, "e64,m4", 0);
   VSETIVLI_SUBTEST(1, "e8,m4", 1);
   VSETIVLI_SUBTEST(1, "e16,m4", 1);
   VSETIVLI_SUBTEST(1, "e32,m4", 1);
-  // VSETIVLI_SUBTEST(1, "e64,m4", 1);
   VSETIVLI_SUBTEST(0, "e8,m8", 0);
   VSETIVLI_SUBTEST(0, "e16,m8", 0);
   VSETIVLI_SUBTEST(0, "e32,m8", 0);
-  // VSETIVLI_SUBTEST(0, "e64,m8", 0);
   VSETIVLI_SUBTEST(1, "e8,m8", 1);
   VSETIVLI_SUBTEST(1, "e16,m8", 1);
   VSETIVLI_SUBTEST(1, "e32,m8", 1);
-  // VSETIVLI_SUBTEST(1, "e64,m8", 1);
-
-#if VLENB_DIV8_SUB1 < 32
-  VSETIVLI_SUBTEST(VLENB_DIV8_SUB1, "e8,mf8", VLENB_DIV8_SUB1);
-  VSETIVLI_SUBTEST(VLENB_DIV8_SUB1, "e16,mf4", VLENB_DIV8_SUB1);
-  VSETIVLI_SUBTEST(VLENB_DIV8_SUB1, "e32,mf2", VLENB_DIV8_SUB1);
-  // VSETIVLI_SUBTEST(VLENB_DIV8_SUB1, "e64,m1", VLENB_DIV8_SUB1);
-#endif
-
-#if VLENB_DIV8 < 32
-  VSETIVLI_SUBTEST(VLENB_DIV8, "e8,mf8", VLENB_DIV8);
-  VSETIVLI_SUBTEST(VLENB_DIV8, "e16,mf4", VLENB_DIV8);
-  VSETIVLI_SUBTEST(VLENB_DIV8, "e32,mf2", VLENB_DIV8);
-  // VSETIVLI_SUBTEST(VLENB_DIV8, "e64,m1", VLENB_DIV8);
-#endif
-
-#if VLENB_DIV8_ADD1 < 32
-  VSETIVLI_SUBTEST(VLENB_DIV8_ADD1, "e8,mf8", VLENB_DIV8);
-  VSETIVLI_SUBTEST(VLENB_DIV8_ADD1, "e16,mf4", VLENB_DIV8);
-  VSETIVLI_SUBTEST(VLENB_DIV8_ADD1, "e32,mf2", VLENB_DIV8);
-  // VSETIVLI_SUBTEST(VLENB_DIV8_ADD1, "e64,m1", VLENB_DIV8);
-#endif
 
 #if VLENB_DIV4_SUB1 < 32
   VSETIVLI_SUBTEST(VLENB_DIV4_SUB1, "e8,mf4", VLENB_DIV4_SUB1);
   VSETIVLI_SUBTEST(VLENB_DIV4_SUB1, "e16,mf2", VLENB_DIV4_SUB1);
   VSETIVLI_SUBTEST(VLENB_DIV4_SUB1, "e32,m1", VLENB_DIV4_SUB1);
-  // VSETIVLI_SUBTEST(VLENB_DIV4_SUB1, "e64,m2", VLENB_DIV4_SUB1);
 #endif
 
 #if VLENB_DIV4 < 32
   VSETIVLI_SUBTEST(VLENB_DIV4, "e8,mf4", VLENB_DIV4);
   VSETIVLI_SUBTEST(VLENB_DIV4, "e16,mf2", VLENB_DIV4);
   VSETIVLI_SUBTEST(VLENB_DIV4, "e32,m1", VLENB_DIV4);
-  // VSETIVLI_SUBTEST(VLENB_DIV4, "e64,m2", VLENB_DIV4);
 #endif
 
 #if VLENB_DIV4_ADD1 < 32
   VSETIVLI_SUBTEST(VLENB_DIV4_ADD1, "e8,mf4", VLENB_DIV4);
   VSETIVLI_SUBTEST(VLENB_DIV4_ADD1, "e16,mf2", VLENB_DIV4);
   VSETIVLI_SUBTEST(VLENB_DIV4_ADD1, "e32,m1", VLENB_DIV4);
-  // VSETIVLI_SUBTEST(VLENB_DIV4_ADD1, "e64,m2", VLENB_DIV4);
 #endif
 
 #if VLENB_DIV2_SUB1 < 32
   VSETIVLI_SUBTEST(VLENB_DIV2_SUB1, "e8,mf2", VLENB_DIV2_SUB1);
   VSETIVLI_SUBTEST(VLENB_DIV2_SUB1, "e16,m1", VLENB_DIV2_SUB1);
   VSETIVLI_SUBTEST(VLENB_DIV2_SUB1, "e32,m2", VLENB_DIV2_SUB1);
-  // VSETIVLI_SUBTEST(VLENB_DIV2_SUB1, "e64,m4", VLENB_DIV2_SUB1);
 #endif
 
 #if VLENB_DIV2 < 32
   VSETIVLI_SUBTEST(VLENB_DIV2, "e8,mf2", VLENB_DIV2);
   VSETIVLI_SUBTEST(VLENB_DIV2, "e16,m1", VLENB_DIV2);
   VSETIVLI_SUBTEST(VLENB_DIV2, "e32,m2", VLENB_DIV2);
-  // VSETIVLI_SUBTEST(VLENB_DIV2, "e64,m4", VLENB_DIV2);
 #endif
 
 #if VLENB_DIV2_ADD1 < 32
   VSETIVLI_SUBTEST(VLENB_DIV2_ADD1, "e8,mf2", VLENB_DIV2);
   VSETIVLI_SUBTEST(VLENB_DIV2_ADD1, "e16,m1", VLENB_DIV2);
   VSETIVLI_SUBTEST(VLENB_DIV2_ADD1, "e32,m2", VLENB_DIV2);
-  // VSETIVLI_SUBTEST(VLENB_DIV2_ADD1, "e64,m4", VLENB_DIV2);
 #endif
 
 #if VLENB_SUB1 < 32
-
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e16,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e32,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e16,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e32,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e16,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e32,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf8", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e32,mf4", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf4", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e32,mf4", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf4", 0);
-  VSETIVLI_SUBTEST(VLENB_SUB1, "e32,mf4", 0);
-  // VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf4", 0);
-  // VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf2", 0);
-  // VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf2", 0);
-  // VSETIVLI_SUBTEST(VLENB_SUB1, "e64,mf2", 0);
-
   VSETIVLI_SUBTEST(VLENB_SUB1, "e8,m1", VLENB_SUB1);
   VSETIVLI_SUBTEST(VLENB_SUB1, "e16,m2", VLENB_SUB1);
   VSETIVLI_SUBTEST(VLENB_SUB1, "e32,m4", VLENB_SUB1);
-  // VSETIVLI_SUBTEST(VLENB_SUB1, "e64,m8", VLENB_SUB1);
 #endif
 
 #if VLENB < 32
   VSETIVLI_SUBTEST(VLENB, "e8,m1", VLENB);
   VSETIVLI_SUBTEST(VLENB, "e16,m2", VLENB);
   VSETIVLI_SUBTEST(VLENB, "e32,m4", VLENB);
-  // VSETIVLI_SUBTEST(VLENB, "e64,m8", VLENB);
 #endif
 
 #if VLENB_ADD1 < 32
   VSETIVLI_SUBTEST(VLENB_ADD1, "e8,m1", VLENB);
   VSETIVLI_SUBTEST(VLENB_ADD1, "e16,m2", VLENB);
   VSETIVLI_SUBTEST(VLENB_ADD1, "e32,m4", VLENB);
-  // VSETIVLI_SUBTEST(VLENB_ADD1, "e64,m8", VLENB);
 #endif
 
 #if VLENB_MUL2_SUB1 < 32