Fixed tis.config

diff --git a/tests/gen-tis-config.sh b/tests/gen-tis-config.sh
index 063e7e2dd6f025155e56ae0f6f7bc58810f236b6..35a47cf2af27d8ac7d63e8eb498816e5fc9800f4 100755 (executable)
--- a/tests/gen-tis-config.sh
+++ b/tests/gen-tis-config.sh
@@ -136,16 +136,16 @@ do
         "mipsel_n32"  \
         "apple_ppc_32"
     do
-        echo '{ "name"           : "p1305 - sparc_64"'           >> $TIS_CONFIG
+        echo '{ "name"           :' "\"$entry_point - $platform\"" >> $TIS_CONFIG
         echo ', "files"          :'                 \
              '["src/monocypher.c",'                 \
              '"src/optional/monocypher-ed25519.c",' \
-             '"tests/test.c" ]'                                  >> $TIS_CONFIG
-        echo ', "compilation_cmd": "-Isrc -Isrc/optional"'       >> $TIS_CONFIG
-        echo ', "machdep"        :' "$platform"                  >> $TIS_CONFIG
-#       echo ', "raw_options     : " { "-no-results" : "true" }' >> $TIS_CONFIG
-        echo ', "main"           :' "$entry_point"               >> $TIS_CONFIG
-        echo '},'                                                >> $TIS_CONFIG
+             '"tests/test.c" ]'                                    >> $TIS_CONFIG
+        echo ', "compilation_cmd": "-Isrc -Isrc/optional"'         >> $TIS_CONFIG
+        echo ', "machdep"        :' "\"$platform\""                >> $TIS_CONFIG
+#       echo ', "raw_options     : " { "-no-results" : "true" }'   >> $TIS_CONFIG
+        echo ', "main"           :' "\"$entry_point\""             >> $TIS_CONFIG
+        echo '},'                                                  >> $TIS_CONFIG
     done
 done
 sed -i '$ d' $TIS_CONFIG

diff --git a/tis.config b/tis.config
index 8eb99c9ecca6adefa0dcdd3bc7784adf598322e1..747616218ea1f7e18eb67567d01452b8ead1f9c1 100644 (file)
--- a/tis.config
+++ b/tis.config
@@ -1,6603 +1,6603 @@
 // auto generated with tests/gen-tis-config.sh
 [
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_chacha20
+, "machdep"        : "sparc_64"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_chacha20
+, "machdep"        : "sparc_32"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_chacha20
+, "machdep"        : "x86_32"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_chacha20
+, "machdep"        : "x86_64"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_chacha20
+, "machdep"        : "x86_16"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_chacha20
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_chacha20
+, "machdep"        : "x86_win32"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_chacha20
+, "machdep"        : "x86_win64"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_chacha20
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_chacha20
+, "machdep"        : "arm_eabi"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_chacha20
+, "machdep"        : "aarch64"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_chacha20
+, "machdep"        : "aarch64eb"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_chacha20
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_chacha20
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_chacha20
+, "machdep"        : "mips_o32"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_chacha20
+, "machdep"        : "mips_n32"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_chacha20
+, "machdep"        : "mips_64"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_chacha20
+, "machdep"        : "mipsel_64"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_chacha20
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_chacha20 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_chacha20
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_ietf_chacha20
+, "machdep"        : "sparc_64"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_ietf_chacha20
+, "machdep"        : "sparc_32"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_ietf_chacha20
+, "machdep"        : "x86_32"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_ietf_chacha20
+, "machdep"        : "x86_64"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_ietf_chacha20
+, "machdep"        : "x86_16"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_ietf_chacha20
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_ietf_chacha20
+, "machdep"        : "x86_win32"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_ietf_chacha20
+, "machdep"        : "x86_win64"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_ietf_chacha20
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_ietf_chacha20
+, "machdep"        : "arm_eabi"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_ietf_chacha20
+, "machdep"        : "aarch64"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_ietf_chacha20
+, "machdep"        : "aarch64eb"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_ietf_chacha20
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_ietf_chacha20
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_ietf_chacha20
+, "machdep"        : "mips_o32"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_ietf_chacha20
+, "machdep"        : "mips_n32"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_ietf_chacha20
+, "machdep"        : "mips_64"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_ietf_chacha20
+, "machdep"        : "mipsel_64"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_ietf_chacha20
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ietf_chacha20 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_ietf_chacha20
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_ietf_chacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_hchacha20
+, "machdep"        : "sparc_64"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_hchacha20
+, "machdep"        : "sparc_32"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_hchacha20
+, "machdep"        : "x86_32"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_hchacha20
+, "machdep"        : "x86_64"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_hchacha20
+, "machdep"        : "x86_16"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_hchacha20
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_hchacha20
+, "machdep"        : "x86_win32"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_hchacha20
+, "machdep"        : "x86_win64"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_hchacha20
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_hchacha20
+, "machdep"        : "arm_eabi"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_hchacha20
+, "machdep"        : "aarch64"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_hchacha20
+, "machdep"        : "aarch64eb"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_hchacha20
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_hchacha20
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_hchacha20
+, "machdep"        : "mips_o32"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_hchacha20
+, "machdep"        : "mips_n32"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_hchacha20
+, "machdep"        : "mips_64"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_hchacha20
+, "machdep"        : "mipsel_64"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_hchacha20
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hchacha20 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_hchacha20
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_xchacha20
+, "machdep"        : "sparc_64"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_xchacha20
+, "machdep"        : "sparc_32"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_xchacha20
+, "machdep"        : "x86_32"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_xchacha20
+, "machdep"        : "x86_64"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_xchacha20
+, "machdep"        : "x86_16"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_xchacha20
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_xchacha20
+, "machdep"        : "x86_win32"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_xchacha20
+, "machdep"        : "x86_win64"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_xchacha20
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_xchacha20
+, "machdep"        : "arm_eabi"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_xchacha20
+, "machdep"        : "aarch64"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_xchacha20
+, "machdep"        : "aarch64eb"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_xchacha20
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_xchacha20
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_xchacha20
+, "machdep"        : "mips_o32"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_xchacha20
+, "machdep"        : "mips_n32"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_xchacha20
+, "machdep"        : "mips_64"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_xchacha20
+, "machdep"        : "mipsel_64"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_xchacha20
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_xchacha20 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_xchacha20
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_xchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_poly1305
+, "machdep"        : "sparc_64"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_poly1305
+, "machdep"        : "sparc_32"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_poly1305
+, "machdep"        : "x86_32"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_poly1305
+, "machdep"        : "x86_64"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_poly1305
+, "machdep"        : "x86_16"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_poly1305
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_poly1305
+, "machdep"        : "x86_win32"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_poly1305
+, "machdep"        : "x86_win64"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_poly1305
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_poly1305
+, "machdep"        : "arm_eabi"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_poly1305
+, "machdep"        : "aarch64"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_poly1305
+, "machdep"        : "aarch64eb"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_poly1305
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_poly1305
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_poly1305
+, "machdep"        : "mips_o32"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_poly1305
+, "machdep"        : "mips_n32"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_poly1305
+, "machdep"        : "mips_64"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_poly1305
+, "machdep"        : "mipsel_64"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_poly1305
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_poly1305 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_poly1305
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_aead_ietf
+, "machdep"        : "sparc_64"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_aead_ietf
+, "machdep"        : "sparc_32"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_aead_ietf
+, "machdep"        : "x86_32"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_aead_ietf
+, "machdep"        : "x86_64"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_aead_ietf
+, "machdep"        : "x86_16"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_aead_ietf
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_aead_ietf
+, "machdep"        : "x86_win32"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_aead_ietf
+, "machdep"        : "x86_win64"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_aead_ietf
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_aead_ietf
+, "machdep"        : "arm_eabi"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_aead_ietf
+, "machdep"        : "aarch64"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_aead_ietf
+, "machdep"        : "aarch64eb"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_aead_ietf
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_aead_ietf
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_aead_ietf
+, "machdep"        : "mips_o32"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_aead_ietf
+, "machdep"        : "mips_n32"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_aead_ietf
+, "machdep"        : "mips_64"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_aead_ietf
+, "machdep"        : "mipsel_64"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_aead_ietf
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_aead_ietf - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_aead_ietf
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_aead_ietf"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_blake2b
+, "machdep"        : "sparc_64"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_blake2b
+, "machdep"        : "sparc_32"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_blake2b
+, "machdep"        : "x86_32"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_blake2b
+, "machdep"        : "x86_64"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_blake2b
+, "machdep"        : "x86_16"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_blake2b
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_blake2b
+, "machdep"        : "x86_win32"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_blake2b
+, "machdep"        : "x86_win64"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_blake2b
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_blake2b
+, "machdep"        : "arm_eabi"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_blake2b
+, "machdep"        : "aarch64"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_blake2b
+, "machdep"        : "aarch64eb"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_blake2b
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_blake2b
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_blake2b
+, "machdep"        : "mips_o32"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_blake2b
+, "machdep"        : "mips_n32"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_blake2b
+, "machdep"        : "mips_64"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_blake2b
+, "machdep"        : "mipsel_64"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_blake2b
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_blake2b - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_blake2b
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_sha512
+, "machdep"        : "sparc_64"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_sha512
+, "machdep"        : "sparc_32"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_sha512
+, "machdep"        : "x86_32"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_sha512
+, "machdep"        : "x86_64"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_sha512
+, "machdep"        : "x86_16"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_sha512
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_sha512
+, "machdep"        : "x86_win32"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_sha512
+, "machdep"        : "x86_win64"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_sha512
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_sha512
+, "machdep"        : "arm_eabi"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_sha512
+, "machdep"        : "aarch64"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_sha512
+, "machdep"        : "aarch64eb"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_sha512
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_sha512
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_sha512
+, "machdep"        : "mips_o32"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_sha512
+, "machdep"        : "mips_n32"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_sha512
+, "machdep"        : "mips_64"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_sha512
+, "machdep"        : "mipsel_64"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_sha512
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_sha512 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_sha512
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_hmac_sha512
+, "machdep"        : "sparc_64"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_hmac_sha512
+, "machdep"        : "sparc_32"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_hmac_sha512
+, "machdep"        : "x86_32"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_hmac_sha512
+, "machdep"        : "x86_64"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_hmac_sha512
+, "machdep"        : "x86_16"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_hmac_sha512
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_hmac_sha512
+, "machdep"        : "x86_win32"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_hmac_sha512
+, "machdep"        : "x86_win64"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_hmac_sha512
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_hmac_sha512
+, "machdep"        : "arm_eabi"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_hmac_sha512
+, "machdep"        : "aarch64"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_hmac_sha512
+, "machdep"        : "aarch64eb"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_hmac_sha512
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_hmac_sha512
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_hmac_sha512
+, "machdep"        : "mips_o32"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_hmac_sha512
+, "machdep"        : "mips_n32"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_hmac_sha512
+, "machdep"        : "mips_64"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_hmac_sha512
+, "machdep"        : "mipsel_64"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_hmac_sha512
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_hmac_sha512 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_hmac_sha512
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_argon2i
+, "machdep"        : "sparc_64"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_argon2i
+, "machdep"        : "sparc_32"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_argon2i
+, "machdep"        : "x86_32"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_argon2i
+, "machdep"        : "x86_64"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_argon2i
+, "machdep"        : "x86_16"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_argon2i
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_argon2i
+, "machdep"        : "x86_win32"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_argon2i
+, "machdep"        : "x86_win64"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_argon2i
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_argon2i
+, "machdep"        : "arm_eabi"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_argon2i
+, "machdep"        : "aarch64"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_argon2i
+, "machdep"        : "aarch64eb"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_argon2i
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_argon2i
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_argon2i
+, "machdep"        : "mips_o32"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_argon2i
+, "machdep"        : "mips_n32"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_argon2i
+, "machdep"        : "mips_64"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_argon2i
+, "machdep"        : "mipsel_64"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_argon2i
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_argon2i - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_argon2i
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_argon2i"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_x25519
+, "machdep"        : "sparc_64"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_x25519
+, "machdep"        : "sparc_32"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_x25519
+, "machdep"        : "x86_32"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_x25519
+, "machdep"        : "x86_64"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_x25519
+, "machdep"        : "x86_16"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_x25519
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_x25519
+, "machdep"        : "x86_win32"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_x25519
+, "machdep"        : "x86_win64"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_x25519
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_x25519
+, "machdep"        : "arm_eabi"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_x25519
+, "machdep"        : "aarch64"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_x25519
+, "machdep"        : "aarch64eb"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_x25519
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_x25519
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_x25519
+, "machdep"        : "mips_o32"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_x25519
+, "machdep"        : "mips_n32"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_x25519
+, "machdep"        : "mips_64"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_x25519
+, "machdep"        : "mipsel_64"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_x25519
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_x25519
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_x25519_pk
+, "machdep"        : "sparc_64"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_x25519_pk
+, "machdep"        : "sparc_32"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_x25519_pk
+, "machdep"        : "x86_32"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_x25519_pk
+, "machdep"        : "x86_64"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_x25519_pk
+, "machdep"        : "x86_16"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_x25519_pk
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_x25519_pk
+, "machdep"        : "x86_win32"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_x25519_pk
+, "machdep"        : "x86_win64"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_x25519_pk
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_x25519_pk
+, "machdep"        : "arm_eabi"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_x25519_pk
+, "machdep"        : "aarch64"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_x25519_pk
+, "machdep"        : "aarch64eb"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_x25519_pk
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_x25519_pk
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_x25519_pk
+, "machdep"        : "mips_o32"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_x25519_pk
+, "machdep"        : "mips_n32"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_x25519_pk
+, "machdep"        : "mips_64"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_x25519_pk
+, "machdep"        : "mipsel_64"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_x25519_pk
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_x25519_pk - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_x25519_pk
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_x25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_key_exchange
+, "machdep"        : "sparc_64"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_key_exchange
+, "machdep"        : "sparc_32"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_key_exchange
+, "machdep"        : "x86_32"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_key_exchange
+, "machdep"        : "x86_64"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_key_exchange
+, "machdep"        : "x86_16"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_key_exchange
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_key_exchange
+, "machdep"        : "x86_win32"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_key_exchange
+, "machdep"        : "x86_win64"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_key_exchange
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_key_exchange
+, "machdep"        : "arm_eabi"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_key_exchange
+, "machdep"        : "aarch64"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_key_exchange
+, "machdep"        : "aarch64eb"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_key_exchange
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_key_exchange
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_key_exchange
+, "machdep"        : "mips_o32"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_key_exchange
+, "machdep"        : "mips_n32"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_key_exchange
+, "machdep"        : "mips_64"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_key_exchange
+, "machdep"        : "mipsel_64"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_key_exchange
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_key_exchange - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_key_exchange
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_key_exchange"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_edDSA
+, "machdep"        : "sparc_64"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_edDSA
+, "machdep"        : "sparc_32"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_edDSA
+, "machdep"        : "x86_32"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_edDSA
+, "machdep"        : "x86_64"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_edDSA
+, "machdep"        : "x86_16"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_edDSA
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_edDSA
+, "machdep"        : "x86_win32"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_edDSA
+, "machdep"        : "x86_win64"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_edDSA
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_edDSA
+, "machdep"        : "arm_eabi"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_edDSA
+, "machdep"        : "aarch64"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_edDSA
+, "machdep"        : "aarch64eb"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_edDSA
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_edDSA
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_edDSA
+, "machdep"        : "mips_o32"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_edDSA
+, "machdep"        : "mips_n32"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_edDSA
+, "machdep"        : "mips_64"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_edDSA
+, "machdep"        : "mipsel_64"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_edDSA
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_edDSA
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_edDSA"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_edDSA_pk
+, "machdep"        : "sparc_64"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_edDSA_pk
+, "machdep"        : "sparc_32"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_edDSA_pk
+, "machdep"        : "x86_32"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_edDSA_pk
+, "machdep"        : "x86_64"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_edDSA_pk
+, "machdep"        : "x86_16"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_edDSA_pk
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_edDSA_pk
+, "machdep"        : "x86_win32"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_edDSA_pk
+, "machdep"        : "x86_win64"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_edDSA_pk
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_edDSA_pk
+, "machdep"        : "arm_eabi"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_edDSA_pk
+, "machdep"        : "aarch64"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_edDSA_pk
+, "machdep"        : "aarch64eb"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_edDSA_pk
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_edDSA_pk
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_edDSA_pk
+, "machdep"        : "mips_o32"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_edDSA_pk
+, "machdep"        : "mips_n32"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_edDSA_pk
+, "machdep"        : "mips_64"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_edDSA_pk
+, "machdep"        : "mipsel_64"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_edDSA_pk
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_edDSA_pk - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_edDSA_pk
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_edDSA_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_ed_25519
+, "machdep"        : "sparc_64"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_ed_25519
+, "machdep"        : "sparc_32"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_ed_25519
+, "machdep"        : "x86_32"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_ed_25519
+, "machdep"        : "x86_64"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_ed_25519
+, "machdep"        : "x86_16"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_ed_25519
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_ed_25519
+, "machdep"        : "x86_win32"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_ed_25519
+, "machdep"        : "x86_win64"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_ed_25519
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_ed_25519
+, "machdep"        : "arm_eabi"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_ed_25519
+, "machdep"        : "aarch64"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_ed_25519
+, "machdep"        : "aarch64eb"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_ed_25519
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_ed_25519
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_ed_25519
+, "machdep"        : "mips_o32"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_ed_25519
+, "machdep"        : "mips_n32"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_ed_25519
+, "machdep"        : "mips_64"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_ed_25519
+, "machdep"        : "mipsel_64"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_ed_25519
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_ed_25519
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_ed_25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_ed_25519_pk
+, "machdep"        : "sparc_64"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_ed_25519_pk
+, "machdep"        : "sparc_32"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_ed_25519_pk
+, "machdep"        : "x86_32"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_ed_25519_pk
+, "machdep"        : "x86_64"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_ed_25519_pk
+, "machdep"        : "x86_16"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_ed_25519_pk
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_ed_25519_pk
+, "machdep"        : "x86_win32"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_ed_25519_pk
+, "machdep"        : "x86_win64"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_ed_25519_pk
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_ed_25519_pk
+, "machdep"        : "arm_eabi"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_ed_25519_pk
+, "machdep"        : "aarch64"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_ed_25519_pk
+, "machdep"        : "aarch64eb"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_ed_25519_pk
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_ed_25519_pk
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_ed_25519_pk
+, "machdep"        : "mips_o32"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_ed_25519_pk
+, "machdep"        : "mips_n32"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_ed_25519_pk
+, "machdep"        : "mips_64"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_ed_25519_pk
+, "machdep"        : "mipsel_64"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_ed_25519_pk
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_pk - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_ed_25519_pk
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_ed_25519_pk"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_ed_25519_check
+, "machdep"        : "sparc_64"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_ed_25519_check
+, "machdep"        : "sparc_32"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_ed_25519_check
+, "machdep"        : "x86_32"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_ed_25519_check
+, "machdep"        : "x86_64"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_ed_25519_check
+, "machdep"        : "x86_16"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_ed_25519_check
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_ed_25519_check
+, "machdep"        : "x86_win32"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_ed_25519_check
+, "machdep"        : "x86_win64"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_ed_25519_check
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_ed_25519_check
+, "machdep"        : "arm_eabi"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_ed_25519_check
+, "machdep"        : "aarch64"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_ed_25519_check
+, "machdep"        : "aarch64eb"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_ed_25519_check
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_ed_25519_check
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_ed_25519_check
+, "machdep"        : "mips_o32"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_ed_25519_check
+, "machdep"        : "mips_n32"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_ed_25519_check
+, "machdep"        : "mips_64"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_ed_25519_check
+, "machdep"        : "mipsel_64"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_ed_25519_check
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_ed_25519_check - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_ed_25519_check
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_ed_25519_check"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_elligator_dir
+, "machdep"        : "sparc_64"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_elligator_dir
+, "machdep"        : "sparc_32"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_elligator_dir
+, "machdep"        : "x86_32"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_elligator_dir
+, "machdep"        : "x86_64"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_elligator_dir
+, "machdep"        : "x86_16"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_elligator_dir
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_elligator_dir
+, "machdep"        : "x86_win32"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_elligator_dir
+, "machdep"        : "x86_win64"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_elligator_dir
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_elligator_dir
+, "machdep"        : "arm_eabi"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_elligator_dir
+, "machdep"        : "aarch64"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_elligator_dir
+, "machdep"        : "aarch64eb"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_elligator_dir
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_elligator_dir
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_elligator_dir
+, "machdep"        : "mips_o32"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_elligator_dir
+, "machdep"        : "mips_n32"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_elligator_dir
+, "machdep"        : "mips_64"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_elligator_dir
+, "machdep"        : "mipsel_64"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_elligator_dir
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_dir - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_elligator_dir
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_elligator_dir"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : v_elligator_inv
+, "machdep"        : "sparc_64"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : v_elligator_inv
+, "machdep"        : "sparc_32"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : v_elligator_inv
+, "machdep"        : "x86_32"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : v_elligator_inv
+, "machdep"        : "x86_64"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : v_elligator_inv
+, "machdep"        : "x86_16"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : v_elligator_inv
+, "machdep"        : "x86_16_huge"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : v_elligator_inv
+, "machdep"        : "x86_win32"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : v_elligator_inv
+, "machdep"        : "x86_win64"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : v_elligator_inv
+, "machdep"        : "armeb_eabi"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : v_elligator_inv
+, "machdep"        : "arm_eabi"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : v_elligator_inv
+, "machdep"        : "aarch64"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : v_elligator_inv
+, "machdep"        : "aarch64eb"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : v_elligator_inv
+, "machdep"        : "rv64ifdq"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : v_elligator_inv
+, "machdep"        : "rv32ifdq"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : v_elligator_inv
+, "machdep"        : "mips_o32"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : v_elligator_inv
+, "machdep"        : "mips_n32"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : v_elligator_inv
+, "machdep"        : "mips_64"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : v_elligator_inv
+, "machdep"        : "mipsel_64"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : v_elligator_inv
+, "machdep"        : "mipsel_n32"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "v_elligator_inv - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : v_elligator_inv
+, "machdep"        : "apple_ppc_32"
+, "main"           : "v_elligator_inv"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : test_x25519
+, "machdep"        : "sparc_64"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : test_x25519
+, "machdep"        : "sparc_32"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : test_x25519
+, "machdep"        : "x86_32"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : test_x25519
+, "machdep"        : "x86_64"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : test_x25519
+, "machdep"        : "x86_16"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : test_x25519
+, "machdep"        : "x86_16_huge"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : test_x25519
+, "machdep"        : "x86_win32"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : test_x25519
+, "machdep"        : "x86_win64"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : test_x25519
+, "machdep"        : "armeb_eabi"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : test_x25519
+, "machdep"        : "arm_eabi"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : test_x25519
+, "machdep"        : "aarch64"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : test_x25519
+, "machdep"        : "aarch64eb"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : test_x25519
+, "machdep"        : "rv64ifdq"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : test_x25519
+, "machdep"        : "rv32ifdq"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : test_x25519
+, "machdep"        : "mips_o32"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : test_x25519
+, "machdep"        : "mips_n32"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : test_x25519
+, "machdep"        : "mips_64"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : test_x25519
+, "machdep"        : "mipsel_64"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : test_x25519
+, "machdep"        : "mipsel_n32"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "test_x25519 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : test_x25519
+, "machdep"        : "apple_ppc_32"
+, "main"           : "test_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_verify16
+, "machdep"        : "sparc_64"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_verify16
+, "machdep"        : "sparc_32"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_verify16
+, "machdep"        : "x86_32"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_verify16
+, "machdep"        : "x86_64"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_verify16
+, "machdep"        : "x86_16"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_verify16
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_verify16
+, "machdep"        : "x86_win32"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_verify16
+, "machdep"        : "x86_win64"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_verify16
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_verify16
+, "machdep"        : "arm_eabi"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_verify16
+, "machdep"        : "aarch64"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_verify16
+, "machdep"        : "aarch64eb"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_verify16
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_verify16
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_verify16
+, "machdep"        : "mips_o32"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_verify16
+, "machdep"        : "mips_n32"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_verify16
+, "machdep"        : "mips_64"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_verify16
+, "machdep"        : "mipsel_64"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_verify16
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify16 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_verify16
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_verify16"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_verify32
+, "machdep"        : "sparc_64"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_verify32
+, "machdep"        : "sparc_32"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_verify32
+, "machdep"        : "x86_32"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_verify32
+, "machdep"        : "x86_64"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_verify32
+, "machdep"        : "x86_16"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_verify32
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_verify32
+, "machdep"        : "x86_win32"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_verify32
+, "machdep"        : "x86_win64"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_verify32
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_verify32
+, "machdep"        : "arm_eabi"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_verify32
+, "machdep"        : "aarch64"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_verify32
+, "machdep"        : "aarch64eb"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_verify32
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_verify32
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_verify32
+, "machdep"        : "mips_o32"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_verify32
+, "machdep"        : "mips_n32"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_verify32
+, "machdep"        : "mips_64"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_verify32
+, "machdep"        : "mipsel_64"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_verify32
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify32 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_verify32
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_verify32"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_verify64
+, "machdep"        : "sparc_64"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_verify64
+, "machdep"        : "sparc_32"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_verify64
+, "machdep"        : "x86_32"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_verify64
+, "machdep"        : "x86_64"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_verify64
+, "machdep"        : "x86_16"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_verify64
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_verify64
+, "machdep"        : "x86_win32"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_verify64
+, "machdep"        : "x86_win64"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_verify64
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_verify64
+, "machdep"        : "arm_eabi"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_verify64
+, "machdep"        : "aarch64"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_verify64
+, "machdep"        : "aarch64eb"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_verify64
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_verify64
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_verify64
+, "machdep"        : "mips_o32"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_verify64
+, "machdep"        : "mips_n32"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_verify64
+, "machdep"        : "mips_64"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_verify64
+, "machdep"        : "mipsel_64"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_verify64
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_verify64 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_verify64
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_verify64"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_chacha20_ctr
+, "machdep"        : "sparc_64"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_chacha20_ctr
+, "machdep"        : "sparc_32"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_chacha20_ctr
+, "machdep"        : "x86_32"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_chacha20_ctr
+, "machdep"        : "x86_64"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_chacha20_ctr
+, "machdep"        : "x86_16"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_chacha20_ctr
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_chacha20_ctr
+, "machdep"        : "x86_win32"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_chacha20_ctr
+, "machdep"        : "x86_win64"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_chacha20_ctr
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_chacha20_ctr
+, "machdep"        : "arm_eabi"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_chacha20_ctr
+, "machdep"        : "aarch64"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_chacha20_ctr
+, "machdep"        : "aarch64eb"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_chacha20_ctr
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_chacha20_ctr
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_chacha20_ctr
+, "machdep"        : "mips_o32"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_chacha20_ctr
+, "machdep"        : "mips_n32"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_chacha20_ctr
+, "machdep"        : "mips_64"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_chacha20_ctr
+, "machdep"        : "mipsel_64"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_chacha20_ctr
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_ctr - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_chacha20_ctr
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_chacha20_ctr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_chacha20_stream
+, "machdep"        : "sparc_64"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_chacha20_stream
+, "machdep"        : "sparc_32"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_chacha20_stream
+, "machdep"        : "x86_32"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_chacha20_stream
+, "machdep"        : "x86_64"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_chacha20_stream
+, "machdep"        : "x86_16"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_chacha20_stream
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_chacha20_stream
+, "machdep"        : "x86_win32"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_chacha20_stream
+, "machdep"        : "x86_win64"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_chacha20_stream
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_chacha20_stream
+, "machdep"        : "arm_eabi"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_chacha20_stream
+, "machdep"        : "aarch64"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_chacha20_stream
+, "machdep"        : "aarch64eb"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_chacha20_stream
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_chacha20_stream
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_chacha20_stream
+, "machdep"        : "mips_o32"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_chacha20_stream
+, "machdep"        : "mips_n32"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_chacha20_stream
+, "machdep"        : "mips_64"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_chacha20_stream
+, "machdep"        : "mipsel_64"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_chacha20_stream
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_stream - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_chacha20_stream
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_chacha20_stream"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "sparc_64"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "sparc_32"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "x86_32"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "x86_64"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "x86_16"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "x86_win32"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "x86_win64"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "arm_eabi"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "aarch64"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "aarch64eb"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "mips_o32"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "mips_n32"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "mips_64"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "mipsel_64"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_chacha20_same_ptr - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_chacha20_same_ptr
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_chacha20_same_ptr"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_hchacha20
+, "machdep"        : "sparc_64"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_hchacha20
+, "machdep"        : "sparc_32"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_hchacha20
+, "machdep"        : "x86_32"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_hchacha20
+, "machdep"        : "x86_64"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_hchacha20
+, "machdep"        : "x86_16"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_hchacha20
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_hchacha20
+, "machdep"        : "x86_win32"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_hchacha20
+, "machdep"        : "x86_win64"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_hchacha20
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_hchacha20
+, "machdep"        : "arm_eabi"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_hchacha20
+, "machdep"        : "aarch64"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_hchacha20
+, "machdep"        : "aarch64eb"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_hchacha20
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_hchacha20
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_hchacha20
+, "machdep"        : "mips_o32"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_hchacha20
+, "machdep"        : "mips_n32"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_hchacha20
+, "machdep"        : "mips_64"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_hchacha20
+, "machdep"        : "mipsel_64"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_hchacha20
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hchacha20 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_hchacha20
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_hchacha20"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_poly1305
+, "machdep"        : "sparc_64"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_poly1305
+, "machdep"        : "sparc_32"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_poly1305
+, "machdep"        : "x86_32"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_poly1305
+, "machdep"        : "x86_64"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_poly1305
+, "machdep"        : "x86_16"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_poly1305
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_poly1305
+, "machdep"        : "x86_win32"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_poly1305
+, "machdep"        : "x86_win64"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_poly1305
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_poly1305
+, "machdep"        : "arm_eabi"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_poly1305
+, "machdep"        : "aarch64"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_poly1305
+, "machdep"        : "aarch64eb"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_poly1305
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_poly1305
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_poly1305
+, "machdep"        : "mips_o32"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_poly1305
+, "machdep"        : "mips_n32"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_poly1305
+, "machdep"        : "mips_64"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_poly1305
+, "machdep"        : "mipsel_64"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_poly1305
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_poly1305
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_poly1305"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_poly1305_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_poly1305_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_poly1305_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_poly1305_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_poly1305_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_poly1305_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_poly1305_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_poly1305_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_poly1305_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_poly1305_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_poly1305_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_poly1305_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_poly1305_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_poly1305_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_poly1305_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_poly1305_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_poly1305_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_poly1305_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_poly1305_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_poly1305_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_poly1305_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_poly1305_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_blake2b
+, "machdep"        : "sparc_64"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_blake2b
+, "machdep"        : "sparc_32"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_blake2b
+, "machdep"        : "x86_32"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_blake2b
+, "machdep"        : "x86_64"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_blake2b
+, "machdep"        : "x86_16"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_blake2b
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_blake2b
+, "machdep"        : "x86_win32"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_blake2b
+, "machdep"        : "x86_win64"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_blake2b
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_blake2b
+, "machdep"        : "arm_eabi"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_blake2b
+, "machdep"        : "aarch64"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_blake2b
+, "machdep"        : "aarch64eb"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_blake2b
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_blake2b
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_blake2b
+, "machdep"        : "mips_o32"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_blake2b
+, "machdep"        : "mips_n32"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_blake2b
+, "machdep"        : "mips_64"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_blake2b
+, "machdep"        : "mipsel_64"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_blake2b
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_blake2b
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_blake2b"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_blake2b_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_blake2b_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_blake2b_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_blake2b_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_blake2b_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_blake2b_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_blake2b_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_blake2b_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_blake2b_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_blake2b_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_blake2b_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_blake2b_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_blake2b_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_blake2b_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_blake2b_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_blake2b_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_blake2b_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_blake2b_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_blake2b_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_blake2b_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_blake2b_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_blake2b_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_sha512
+, "machdep"        : "sparc_64"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_sha512
+, "machdep"        : "sparc_32"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_sha512
+, "machdep"        : "x86_32"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_sha512
+, "machdep"        : "x86_64"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_sha512
+, "machdep"        : "x86_16"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_sha512
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_sha512
+, "machdep"        : "x86_win32"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_sha512
+, "machdep"        : "x86_win64"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_sha512
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_sha512
+, "machdep"        : "arm_eabi"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_sha512
+, "machdep"        : "aarch64"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_sha512
+, "machdep"        : "aarch64eb"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_sha512
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_sha512
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_sha512
+, "machdep"        : "mips_o32"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_sha512
+, "machdep"        : "mips_n32"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_sha512
+, "machdep"        : "mips_64"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_sha512
+, "machdep"        : "mipsel_64"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_sha512
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_sha512
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_sha512_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_sha512_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_sha512_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_sha512_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_sha512_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_sha512_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_sha512_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_sha512_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_sha512_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_sha512_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_sha512_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_sha512_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_sha512_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_sha512_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_sha512_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_sha512_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_sha512_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_sha512_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_sha512_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_sha512_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_sha512_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_hmac_sha512
+, "machdep"        : "sparc_64"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_hmac_sha512
+, "machdep"        : "sparc_32"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_hmac_sha512
+, "machdep"        : "x86_32"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_hmac_sha512
+, "machdep"        : "x86_64"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_hmac_sha512
+, "machdep"        : "x86_16"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_hmac_sha512
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_hmac_sha512
+, "machdep"        : "x86_win32"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_hmac_sha512
+, "machdep"        : "x86_win64"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_hmac_sha512
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_hmac_sha512
+, "machdep"        : "arm_eabi"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_hmac_sha512
+, "machdep"        : "aarch64"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_hmac_sha512
+, "machdep"        : "aarch64eb"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_hmac_sha512
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_hmac_sha512
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_hmac_sha512
+, "machdep"        : "mips_o32"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_hmac_sha512
+, "machdep"        : "mips_n32"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_hmac_sha512
+, "machdep"        : "mips_64"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_hmac_sha512
+, "machdep"        : "mipsel_64"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_hmac_sha512
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_hmac_sha512
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_hmac_sha512"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_hmac_sha512_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_hmac_sha512_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_hmac_sha512_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_argon2i_easy
+, "machdep"        : "sparc_64"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_argon2i_easy
+, "machdep"        : "sparc_32"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_argon2i_easy
+, "machdep"        : "x86_32"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_argon2i_easy
+, "machdep"        : "x86_64"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_argon2i_easy
+, "machdep"        : "x86_16"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_argon2i_easy
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_argon2i_easy
+, "machdep"        : "x86_win32"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_argon2i_easy
+, "machdep"        : "x86_win64"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_argon2i_easy
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_argon2i_easy
+, "machdep"        : "arm_eabi"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_argon2i_easy
+, "machdep"        : "aarch64"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_argon2i_easy
+, "machdep"        : "aarch64eb"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_argon2i_easy
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_argon2i_easy
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_argon2i_easy
+, "machdep"        : "mips_o32"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_argon2i_easy
+, "machdep"        : "mips_n32"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_argon2i_easy
+, "machdep"        : "mips_64"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_argon2i_easy
+, "machdep"        : "mipsel_64"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_argon2i_easy
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_easy - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_argon2i_easy
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_argon2i_easy"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_argon2i_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_argon2i_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_argon2i_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_argon2i_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_argon2i_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_argon2i_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_argon2i_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_argon2i_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_argon2i_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_argon2i_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_argon2i_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_argon2i_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_argon2i_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_argon2i_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_argon2i_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_argon2i_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_argon2i_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_argon2i_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_argon2i_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_argon2i_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_argon2i_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_argon2i_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_x25519_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_x25519_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_x25519_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_x25519_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_x25519_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_x25519_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_x25519_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_x25519_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_x25519_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_x25519_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_x25519_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_x25519_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_x25519_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_x25519_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_x25519_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_x25519_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_x25519_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_x25519_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_x25519_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_x25519_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_x25519_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_key_exchange_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_key_exchange_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_key_exchange_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "sparc_64"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "sparc_32"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "x86_32"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "x86_64"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "x86_16"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "x86_win32"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "x86_win64"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "arm_eabi"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "aarch64"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "aarch64eb"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "mips_o32"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "mips_n32"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "mips_64"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "mipsel_64"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_roundtrip - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_eddsa_roundtrip
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_eddsa_roundtrip"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_eddsa_random
+, "machdep"        : "sparc_64"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_eddsa_random
+, "machdep"        : "sparc_32"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_eddsa_random
+, "machdep"        : "x86_32"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_eddsa_random
+, "machdep"        : "x86_64"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_eddsa_random
+, "machdep"        : "x86_16"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_eddsa_random
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_eddsa_random
+, "machdep"        : "x86_win32"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_eddsa_random
+, "machdep"        : "x86_win64"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_eddsa_random
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_eddsa_random
+, "machdep"        : "arm_eabi"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_eddsa_random
+, "machdep"        : "aarch64"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_eddsa_random
+, "machdep"        : "aarch64eb"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_eddsa_random
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_eddsa_random
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_eddsa_random
+, "machdep"        : "mips_o32"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_eddsa_random
+, "machdep"        : "mips_n32"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_eddsa_random
+, "machdep"        : "mips_64"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_eddsa_random
+, "machdep"        : "mipsel_64"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_eddsa_random
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_random - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_eddsa_random
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_eddsa_random"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_eddsa_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_eddsa_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_eddsa_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_eddsa_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_eddsa_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_eddsa_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_eddsa_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_eddsa_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_eddsa_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_eddsa_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_eddsa_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_eddsa_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_eddsa_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_eddsa_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_eddsa_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_eddsa_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_eddsa_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_eddsa_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_eddsa_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_eddsa_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_eddsa_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_eddsa_incremental
+, "machdep"        : "sparc_64"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_eddsa_incremental
+, "machdep"        : "sparc_32"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_eddsa_incremental
+, "machdep"        : "x86_32"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_eddsa_incremental
+, "machdep"        : "x86_64"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_eddsa_incremental
+, "machdep"        : "x86_16"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_eddsa_incremental
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_eddsa_incremental
+, "machdep"        : "x86_win32"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_eddsa_incremental
+, "machdep"        : "x86_win64"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_eddsa_incremental
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_eddsa_incremental
+, "machdep"        : "arm_eabi"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_eddsa_incremental
+, "machdep"        : "aarch64"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_eddsa_incremental
+, "machdep"        : "aarch64eb"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_eddsa_incremental
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_eddsa_incremental
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_eddsa_incremental
+, "machdep"        : "mips_o32"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_eddsa_incremental
+, "machdep"        : "mips_n32"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_eddsa_incremental
+, "machdep"        : "mips_64"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_eddsa_incremental
+, "machdep"        : "mipsel_64"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_eddsa_incremental
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_eddsa_incremental - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_eddsa_incremental
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_eddsa_incremental"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_aead
+, "machdep"        : "sparc_64"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_aead
+, "machdep"        : "sparc_32"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_aead
+, "machdep"        : "x86_32"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_aead
+, "machdep"        : "x86_64"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_aead
+, "machdep"        : "x86_16"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_aead
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_aead
+, "machdep"        : "x86_win32"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_aead
+, "machdep"        : "x86_win64"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_aead
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_aead
+, "machdep"        : "arm_eabi"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_aead
+, "machdep"        : "aarch64"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_aead
+, "machdep"        : "aarch64eb"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_aead
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_aead
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_aead
+, "machdep"        : "mips_o32"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_aead
+, "machdep"        : "mips_n32"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_aead
+, "machdep"        : "mips_64"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_aead
+, "machdep"        : "mipsel_64"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_aead
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_aead - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_aead
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_aead"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "sparc_64"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "sparc_32"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "x86_32"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "x86_64"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "x86_16"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "x86_win32"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "x86_win64"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "arm_eabi"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "aarch64"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "aarch64eb"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "mips_o32"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "mips_n32"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "mips_64"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "mipsel_64"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_msb - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_elligator_direct_msb
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_elligator_direct_msb"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_direct_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_elligator_direct_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_elligator_direct_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_inverse_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_elligator_inverse_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_elligator_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_elligator_x25519
+, "machdep"        : "sparc_64"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_elligator_x25519
+, "machdep"        : "sparc_32"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_elligator_x25519
+, "machdep"        : "x86_32"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_elligator_x25519
+, "machdep"        : "x86_64"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_elligator_x25519
+, "machdep"        : "x86_16"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_elligator_x25519
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_elligator_x25519
+, "machdep"        : "x86_win32"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_elligator_x25519
+, "machdep"        : "x86_win64"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_elligator_x25519
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_elligator_x25519
+, "machdep"        : "arm_eabi"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_elligator_x25519
+, "machdep"        : "aarch64"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_elligator_x25519
+, "machdep"        : "aarch64eb"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_elligator_x25519
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_elligator_x25519
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_elligator_x25519
+, "machdep"        : "mips_o32"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_elligator_x25519
+, "machdep"        : "mips_n32"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_elligator_x25519
+, "machdep"        : "mips_64"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_elligator_x25519
+, "machdep"        : "mipsel_64"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_elligator_x25519
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_x25519 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_elligator_x25519
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_elligator_x25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_elligator_key_pair
+, "machdep"        : "sparc_64"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_elligator_key_pair
+, "machdep"        : "sparc_32"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_elligator_key_pair
+, "machdep"        : "x86_32"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_elligator_key_pair
+, "machdep"        : "x86_64"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_elligator_key_pair
+, "machdep"        : "x86_16"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_elligator_key_pair
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_elligator_key_pair
+, "machdep"        : "x86_win32"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_elligator_key_pair
+, "machdep"        : "x86_win64"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_elligator_key_pair
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_elligator_key_pair
+, "machdep"        : "arm_eabi"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_elligator_key_pair
+, "machdep"        : "aarch64"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_elligator_key_pair
+, "machdep"        : "aarch64eb"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_elligator_key_pair
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_elligator_key_pair
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_elligator_key_pair
+, "machdep"        : "mips_o32"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_elligator_key_pair
+, "machdep"        : "mips_n32"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_elligator_key_pair
+, "machdep"        : "mips_64"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_elligator_key_pair
+, "machdep"        : "mipsel_64"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_elligator_key_pair
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_elligator_key_pair
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_elligator_key_pair"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_elligator_key_pair_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_elligator_key_pair_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_elligator_key_pair_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_x25519_inverse
+, "machdep"        : "sparc_64"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_x25519_inverse
+, "machdep"        : "sparc_32"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_x25519_inverse
+, "machdep"        : "x86_32"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_x25519_inverse
+, "machdep"        : "x86_64"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_x25519_inverse
+, "machdep"        : "x86_16"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_x25519_inverse
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_x25519_inverse
+, "machdep"        : "x86_win32"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_x25519_inverse
+, "machdep"        : "x86_win64"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_x25519_inverse
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_x25519_inverse
+, "machdep"        : "arm_eabi"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_x25519_inverse
+, "machdep"        : "aarch64"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_x25519_inverse
+, "machdep"        : "aarch64eb"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_x25519_inverse
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_x25519_inverse
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_x25519_inverse
+, "machdep"        : "mips_o32"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_x25519_inverse
+, "machdep"        : "mips_n32"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_x25519_inverse
+, "machdep"        : "mips_64"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_x25519_inverse
+, "machdep"        : "mipsel_64"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_x25519_inverse
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_x25519_inverse
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_x25519_inverse"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "sparc_64"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "sparc_32"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "x86_32"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "x86_64"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "x86_16"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "x86_win32"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "x86_win64"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "arm_eabi"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "aarch64"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "aarch64eb"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "mips_o32"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "mips_n32"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "mips_64"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "mipsel_64"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_x25519_inverse_overlap - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_x25519_inverse_overlap
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_x25519_inverse_overlap"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_from_eddsa
+, "machdep"        : "sparc_64"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_from_eddsa
+, "machdep"        : "sparc_32"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_from_eddsa
+, "machdep"        : "x86_32"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_from_eddsa
+, "machdep"        : "x86_64"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_from_eddsa
+, "machdep"        : "x86_16"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_from_eddsa
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_from_eddsa
+, "machdep"        : "x86_win32"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_from_eddsa
+, "machdep"        : "x86_win64"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_from_eddsa
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_from_eddsa
+, "machdep"        : "arm_eabi"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_from_eddsa
+, "machdep"        : "aarch64"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_from_eddsa
+, "machdep"        : "aarch64eb"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_from_eddsa
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_from_eddsa
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_from_eddsa
+, "machdep"        : "mips_o32"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_from_eddsa
+, "machdep"        : "mips_n32"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_from_eddsa
+, "machdep"        : "mips_64"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_from_eddsa
+, "machdep"        : "mipsel_64"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_from_eddsa
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_eddsa - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_from_eddsa
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_from_eddsa"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - sparc_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_64
-, "main"           : p_from_ed25519
+, "machdep"        : "sparc_64"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - sparc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : sparc_32
-, "main"           : p_from_ed25519
+, "machdep"        : "sparc_32"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - x86_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_32
-, "main"           : p_from_ed25519
+, "machdep"        : "x86_32"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - x86_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_64
-, "main"           : p_from_ed25519
+, "machdep"        : "x86_64"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - x86_16"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16
-, "main"           : p_from_ed25519
+, "machdep"        : "x86_16"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - x86_16_huge"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_16_huge
-, "main"           : p_from_ed25519
+, "machdep"        : "x86_16_huge"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - x86_win32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win32
-, "main"           : p_from_ed25519
+, "machdep"        : "x86_win32"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - x86_win64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : x86_win64
-, "main"           : p_from_ed25519
+, "machdep"        : "x86_win64"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - armeb_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : armeb_eabi
-, "main"           : p_from_ed25519
+, "machdep"        : "armeb_eabi"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - arm_eabi"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : arm_eabi
-, "main"           : p_from_ed25519
+, "machdep"        : "arm_eabi"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - aarch64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64
-, "main"           : p_from_ed25519
+, "machdep"        : "aarch64"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - aarch64eb"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : aarch64eb
-, "main"           : p_from_ed25519
+, "machdep"        : "aarch64eb"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - rv64ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv64ifdq
-, "main"           : p_from_ed25519
+, "machdep"        : "rv64ifdq"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - rv32ifdq"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : rv32ifdq
-, "main"           : p_from_ed25519
+, "machdep"        : "rv32ifdq"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - mips_o32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_o32
-, "main"           : p_from_ed25519
+, "machdep"        : "mips_o32"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - mips_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_n32
-, "main"           : p_from_ed25519
+, "machdep"        : "mips_n32"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - mips_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mips_64
-, "main"           : p_from_ed25519
+, "machdep"        : "mips_64"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - mipsel_64"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_64
-, "main"           : p_from_ed25519
+, "machdep"        : "mipsel_64"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - mipsel_n32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : mipsel_n32
-, "main"           : p_from_ed25519
+, "machdep"        : "mipsel_n32"
+, "main"           : "p_from_ed25519"
 },
-{ "name"           : "p1305 - sparc_64"
+{ "name"           : "p_from_ed25519 - apple_ppc_32"
 , "files"          : ["src/monocypher.c", "src/optional/monocypher-ed25519.c", "tests/test.c" ]
 , "compilation_cmd": "-Isrc -Isrc/optional"
-, "machdep"        : apple_ppc_32
-, "main"           : p_from_ed25519
+, "machdep"        : "apple_ppc_32"
+, "main"           : "p_from_ed25519"
 }
 ]