From 0b1930307f41db3ea7552d6b2f4666b33c64d26a Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Sun, 9 Jun 2024 20:06:19 +0200 Subject: More cleanup --- old/moves_trans/genmovecode.sh | 19 --- old/moves_trans/gentranscode.sh | 42 ------ old/moves_trans/moves_src.c | 264 ------------------------------------- old/moves_trans/v2/genmovecode.sh | 21 --- old/moves_trans/v2/gentranscode.sh | 24 ---- 5 files changed, 370 deletions(-) delete mode 100755 old/moves_trans/genmovecode.sh delete mode 100755 old/moves_trans/gentranscode.sh delete mode 100644 old/moves_trans/moves_src.c delete mode 100755 old/moves_trans/v2/genmovecode.sh delete mode 100755 old/moves_trans/v2/gentranscode.sh (limited to 'old/moves_trans') diff --git a/old/moves_trans/genmovecode.sh b/old/moves_trans/genmovecode.sh deleted file mode 100755 index 0857f31..0000000 --- a/old/moves_trans/genmovecode.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -type="${1:-src}" - -gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type" - -genfuncs() { - for f in move_??_*.txt; do - move="$(echo $f | sed 's/.*_// ; s/\.txt//')" - printf 'static inline cube_fast_t\n_move_%s' "$move" - printf '(cube_fast_t c)\n{\n' - printf '\tcube_fast_t m = ' - ./h48_to_"$type" <"$f" | sed '2,4s/^/\t/' - printf ';\n\n\treturn compose_fast(c, m);\n}\n\n' - done -} - -genfuncs -rm -f h48_to_"$type" invert diff --git a/old/moves_trans/gentranscode.sh b/old/moves_trans/gentranscode.sh deleted file mode 100755 index 198ac93..0000000 --- a/old/moves_trans/gentranscode.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -type="${1:-src}" - -gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type" -gcc -DDEBUG invert.c ../cube.c -o invert - -# Old version -genarray() { - for f in transform_??_???.txt; do - trans="$(echo $f | sed 's/.*_// ; s/\.txt//')" - printf '[%s] = ' "$trans" - if [ "$1" = "-i" ]; then - ./invert <"$f" | ./h48_to_"$type" - else - ./h48_to_"$type" <"$f" - fi - printf ',\n' - done -} - -genfuncs() { - for f in transform_??_???.txt; do - trans="$(echo $f | sed 's/.*_// ; s/\.txt//')" - printf 'static inline cube_fast_t\n_trans_%s' "$trans" - printf '(cube_fast_t c)\n{\n' - printf '\tcube_fast_t ret;\n\n' - printf '\tcube_fast_t tn = ' - ./h48_to_"$type" <"$f" | sed '2,4s/^/\t/' - printf ';\n\tcube_fast_t ti = ' - ./invert <"$f" | ./h48_to_"$type" | sed '2,4 s/^/\t/' - printf ';\n\n\tret = compose_fast(tn, c);\n' - printf '\tret = compose_fast(ret, ti);\n' - if [ -n "$(echo "$trans" | grep "m")" ]; then - printf '\tret = invertco_fast(ret);\n' - fi - printf '\n\treturn ret;\n}\n\n' - done -} - -genfuncs -rm -f h48_to_"$type" invert diff --git a/old/moves_trans/moves_src.c b/old/moves_trans/moves_src.c deleted file mode 100644 index faf4729..0000000 --- a/old/moves_trans/moves_src.c +++ /dev/null @@ -1,264 +0,0 @@ -#define PERM4(r, i, j, k, l) \ - aux = r[i]; \ - r[i] = r[l]; \ - r[l] = r[k]; \ - r[k] = r[j]; \ - r[j] = aux; -#define PERM22(r, i, j, k, l) \ - aux = r[i]; \ - r[i] = r[j]; \ - r[j] = aux; \ - aux = r[k]; \ - r[k] = r[l]; \ - r[l] = aux; -#define CO(a, b) \ - aux = (a & _cobits) + (b & _cobits); \ - auy = (aux + _ctwist_cw) >> 2U; \ - auz = (aux + auy) & _cobits2; \ - a = (a & _pbits) | auz; -#define CO4(r, i, j, k, l) \ - CO(r[i], _ctwist_cw) \ - CO(r[j], _ctwist_cw) \ - CO(r[k], _ctwist_ccw) \ - CO(r[l], _ctwist_ccw) -#define EO4(r, i, j, k, l) \ - r[i] ^= _eobit; \ - r[j] ^= _eobit; \ - r[k] ^= _eobit; \ - r[l] ^= _eobit; - -_static_inline cube_fast_t -_move_U(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_uf, _e_ul, _e_ub, _e_ur) - PERM4(ret.corner, _c_ufr, _c_ufl, _c_ubl, _c_ubr) - - return ret; -} - -_static_inline cube_fast_t -_move_U2(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM22(ret.edge, _e_uf, _e_ub, _e_ul, _e_ur) - PERM22(ret.corner, _c_ufr, _c_ubl, _c_ufl, _c_ubr) - - return ret; -} - -_static_inline cube_fast_t -_move_U3(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_uf, _e_ur, _e_ub, _e_ul) - PERM4(ret.corner, _c_ufr, _c_ubr, _c_ubl, _c_ufl) - - return ret; -} - -_static_inline cube_fast_t -_move_D(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_df, _e_dr, _e_db, _e_dl) - PERM4(ret.corner, _c_dfr, _c_dbr, _c_dbl, _c_dfl) - - return ret; -} - -_static_inline cube_fast_t -_move_D2(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM22(ret.edge, _e_df, _e_db, _e_dr, _e_dl) - PERM22(ret.corner, _c_dfr, _c_dbl, _c_dbr, _c_dfl) - - return ret; -} - -_static_inline cube_fast_t -_move_D3(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_df, _e_dl, _e_db, _e_dr) - PERM4(ret.corner, _c_dfr, _c_dfl, _c_dbl, _c_dbr) - - return ret; -} - -_static_inline cube_fast_t -_move_R(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_ur, _e_br, _e_dr, _e_fr) - PERM4(ret.corner, _c_ufr, _c_ubr, _c_dbr, _c_dfr) - - CO4(ret.corner, _c_ubr, _c_dfr, _c_ufr, _c_dbr) - - return ret; -} - -_static_inline cube_fast_t -_move_R2(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM22(ret.edge, _e_ur, _e_dr, _e_fr, _e_br) - PERM22(ret.corner, _c_ufr, _c_dbr, _c_ubr, _c_dfr) - - return ret; -} - -_static_inline cube_fast_t -_move_R3(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_ur, _e_fr, _e_dr, _e_br) - PERM4(ret.corner, _c_ufr, _c_dfr, _c_dbr, _c_ubr) - - CO4(ret.corner, _c_ubr, _c_dfr, _c_ufr, _c_dbr) - - return ret; -} - -_static_inline cube_fast_t -_move_L(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_ul, _e_fl, _e_dl, _e_bl) - PERM4(ret.corner, _c_ufl, _c_dfl, _c_dbl, _c_ubl) - - CO4(ret.corner, _c_ufl, _c_dbl, _c_dfl, _c_ubl) - - return ret; -} - -_static_inline cube_fast_t -_move_L2(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM22(ret.edge, _e_ul, _e_dl, _e_fl, _e_bl) - PERM22(ret.corner, _c_ufl, _c_dbl, _c_ubl, _c_dfl) - - return ret; -} - -_static_inline cube_fast_t -_move_L3(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_ul, _e_bl, _e_dl, _e_fl) - PERM4(ret.corner, _c_ufl, _c_ubl, _c_dbl, _c_dfl) - - CO4(ret.corner, _c_ufl, _c_dbl, _c_dfl, _c_ubl) - - return ret; -} - -_static_inline cube_fast_t -_move_F(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_uf, _e_fr, _e_df, _e_fl) - PERM4(ret.corner, _c_ufr, _c_dfr, _c_dfl, _c_ufl) - - EO4(ret.edge, _e_uf, _e_fr, _e_df, _e_fl) - CO4(ret.corner, _c_ufr, _c_dfl, _c_dfr, _c_ufl) - - return ret; -} - -_static_inline cube_fast_t -_move_F2(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM22(ret.edge, _e_uf, _e_df, _e_fr, _e_fl) - PERM22(ret.corner, _c_ufr, _c_dfl, _c_ufl, _c_dfr) - - return ret; -} - -_static_inline cube_fast_t -_move_F3(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_uf, _e_fl, _e_df, _e_fr) - PERM4(ret.corner, _c_ufr, _c_ufl, _c_dfl, _c_dfr) - - EO4(ret.edge, _e_uf, _e_fr, _e_df, _e_fl) - CO4(ret.corner, _c_ufr, _c_dfl, _c_dfr, _c_ufl) - - return ret; -} - -_static_inline cube_fast_t -_move_B(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_ub, _e_bl, _e_db, _e_br) - PERM4(ret.corner, _c_ubr, _c_ubl, _c_dbl, _c_dbr) - - EO4(ret.edge, _e_ub, _e_br, _e_db, _e_bl) - CO4(ret.corner, _c_ubl, _c_dbr, _c_dbl, _c_ubr) - - return ret; -} - -_static_inline cube_fast_t -_move_B2(cube_fast_t c) -{ - uint8_t aux; - cube_fast_t ret = c; - - PERM22(ret.edge, _e_ub, _e_db, _e_br, _e_bl) - PERM22(ret.corner, _c_ubr, _c_dbl, _c_ubl, _c_dbr) - - return ret; -} - -_static_inline cube_fast_t -_move_B3(cube_fast_t c) -{ - uint8_t aux, auy, auz; - cube_fast_t ret = c; - - PERM4(ret.edge, _e_ub, _e_br, _e_db, _e_bl) - PERM4(ret.corner, _c_ubr, _c_dbr, _c_dbl, _c_ubl) - - EO4(ret.edge, _e_ub, _e_br, _e_db, _e_bl) - CO4(ret.corner, _c_ubl, _c_dbr, _c_dbl, _c_ubr) - - return ret; -} diff --git a/old/moves_trans/v2/genmovecode.sh b/old/moves_trans/v2/genmovecode.sh deleted file mode 100755 index 9d5fa7a..0000000 --- a/old/moves_trans/v2/genmovecode.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -type="${1:-src}" - -gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type" - -lineavx() { printf '#define _move_cube_%s ' "$1"; } -linesrc() { printf '_static cube_fast_t _move_cube_%s = ' "$1"; } -sedavx() { sed '1,2s/$/ \\/ ; 3s/$/)/ ; 3q'; } -sedsrc() { sed '3s/$/ };/ ; 3q'; } - -gen() { - for f in move_??_*.txt; do - move="$(echo $f | sed 's/.*_// ; s/\.txt//')" - line$type "$move" - ./h48_to_"$type" <"$f" | sed$type - done -} - -gen -rm -f h48_to_"$type" invert diff --git a/old/moves_trans/v2/gentranscode.sh b/old/moves_trans/v2/gentranscode.sh deleted file mode 100755 index b9d41b6..0000000 --- a/old/moves_trans/v2/gentranscode.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -type="${1:-src}" - -gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type" -gcc -DDEBUG invert.c ../cube.c -o invert - -lineavx() { printf '#define _trans_cube_%s ' "$1"; } -linesrc() { printf '_static cube_fast_t _trans_cube_%s = ' "$1"; } -sedavx() { sed '1,2s/$/ \\/ ; 3s/$/)/ ; 3q'; } -sedsrc() { sed '3s/$/ };/ ; 3q'; } - -gen() { - for f in transform_??_???.txt; do - trans="$(echo $f | sed 's/.*_// ; s/\.txt//')" - line$type "$trans" - ./h48_to_"$type" <"$f" | sed$type - line$type "${trans}_inverse" - ./invert <"$f" | ./h48_to_"$type" | sed$type - done -} - -gen -rm -f h48_to_"$type" invert -- cgit v1.3