move {poly,misc}.{c,h} back to common

slothy-optimizer · Jul 18, 2024 · fc76c5c · fc76c5c
1 parent 7d4ee10
commit fc76c5c
Show file tree

Hide file tree

Showing 105 changed files with 10 additions and 121 deletions.
diff --git a/envs/m55-an547/Makefile b/envs/m55-an547/Makefile
@@ -8,6 +8,7 @@ BUILD_DIR=./build
 
 COMMON_INC=../common/inc/
 ENV_INC=./inc/
+TEST_COMMON=../../tests/common/
 
 SYSROOT := $(shell $(CC) --print-sysroot)
 CFLAGS += \
@@ -22,6 +23,7 @@ CFLAGS += \
 	-I$(ENV_INC) \
 	-I$(SRC_DIR) \
 	-I$(TESTDIR) \
+	-I$(TEST_COMMON) \
 	-I$(SRC_DIR)/platform
 
 ARCH_FLAGS += \
@@ -52,8 +54,10 @@ all: $(TARGET)
 
 HAL_SOURCES = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/*/*.c) $(wildcard ../common/src/*.c)
 OBJECTS_HAL = $(patsubst %.c, $(BUILD_DIR)/%.c.o, $(abspath $(HAL_SOURCES)))
+TEST_COMMON_SOURCES = $(wildcard $(TEST_COMMON)/*.c) 
+OBJECTS_TEST_COMMON = $(patsubst %.c, $(BUILD_DIR)/%.c.o, $(abspath $(TEST_COMMON_SOURCES)))
 OBJECTS_SOURCES=$(patsubst %.c, $(BUILD_DIR)/%.c.o, $(abspath $(SOURCES)))
-OBJECTS_C = $(OBJECTS_SOURCES) $(OBJECTS_HAL)
+OBJECTS_C = $(OBJECTS_SOURCES) $(OBJECTS_HAL) $(OBJECTS_TEST_COMMON)
 OBJECTS_ASM = $(patsubst %.s, $(BUILD_DIR)/%.s.o, $(abspath $(ASMS)))
 
 OBJECTS = $(OBJECTS_C) $(OBJECTS_ASM)

diff --git a/envs/m85-an555/Makefile b/envs/m85-an555/Makefile
@@ -8,6 +8,7 @@ BUILD_DIR=./build
 
 COMMON_INC=../common/inc/
 ENV_INC=./inc/
+TEST_COMMON=../../tests/common/
 
 SYSROOT := $(shell $(CC) --print-sysroot)
 CFLAGS += \
@@ -22,6 +23,7 @@ CFLAGS += \
 	-I$(ENV_INC) \
 	-I$(SRC_DIR) \
 	-I$(TESTDIR) \
+	-I$(TEST_COMMON) \
 	-I$(SRC_DIR)/platform
 
 ARCH_FLAGS += \
@@ -52,8 +54,10 @@ all: $(TARGET)
 
 HAL_SOURCES = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/*/*.c) $(wildcard ../common/src/*.c)
 OBJECTS_HAL = $(patsubst %.c, $(BUILD_DIR)/%.c.o, $(abspath $(HAL_SOURCES)))
+TEST_COMMON_SOURCES = $(wildcard $(TEST_COMMON)/*.c) 
+OBJECTS_TEST_COMMON = $(patsubst %.c, $(BUILD_DIR)/%.c.o, $(abspath $(TEST_COMMON_SOURCES)))
 OBJECTS_SOURCES=$(patsubst %.c, $(BUILD_DIR)/%.c.o, $(abspath $(SOURCES)))
-OBJECTS_C = $(OBJECTS_SOURCES) $(OBJECTS_HAL)
+OBJECTS_C = $(OBJECTS_SOURCES) $(OBJECTS_HAL) $(OBJECTS_TEST_COMMON)
 OBJECTS_ASM = $(patsubst %.s, $(BUILD_DIR)/%.s.o, $(abspath $(ASMS)))
 
 OBJECTS = $(OBJECTS_C) $(OBJECTS_ASM)

diff --git a/tests/chunk/chunk.mk b/tests/chunk/chunk.mk
@@ -9,7 +9,6 @@ CHUNK_PLATFORMS += m85-an555
 
 # C sources required for this test
 CHUNK_SOURCES += main.c
-CHUNK_SOURCES += misc.c
 
 # Assembly sources required for this test
 CHUNK_ASMS += chunk.s

diff --git a/tests/chunk/misc.c b/tests/chunk/misc.c
diff --git a/tests/chunk/misc.h b/tests/chunk/misc.h
diff --git a/tests/crt/crt.mk b/tests/crt/crt.mk
@@ -9,7 +9,6 @@ CRT_PLATFORMS += m85-an555
 
 # C sources required for this test
 CRT_SOURCES += main.c
-CRT_SOURCES += misc.c
 
 # Assembly sources required for this test
 CRT_ASMS += crt.s

diff --git a/tests/crt/misc.c b/tests/crt/misc.c
diff --git a/tests/crt/misc.h b/tests/crt/misc.h
diff --git a/tests/flt-fft/flt-fft.mk b/tests/flt-fft/flt-fft.mk
@@ -9,7 +9,6 @@ FLT_FFT_PLATFORMS += m85-an555
 
 # C sources required for this test
 FLT_FFT_SOURCES += main.c
-FLT_FFT_SOURCES += misc.c
 
 # Assembly sources required for this test
 FLT_FFT_ASMS += base_ref.s

diff --git a/tests/flt-fft/misc.c b/tests/flt-fft/misc.c
diff --git a/tests/flt-fft/misc.h b/tests/flt-fft/misc.h
diff --git a/tests/fx-fft/fx-fft.mk b/tests/fx-fft/fx-fft.mk
@@ -9,8 +9,6 @@ FX_FFT_PLATFORMS += m85-an555
 
 # C sources required for this test
 FX_FFT_SOURCES += main.c
-FX_FFT_SOURCES += misc.c
-
 
 # Assembly sources required for this test
 FX_FFT_ASMS += base_concrete.s

diff --git a/tests/fx-fft/misc.c b/tests/fx-fft/misc.c
diff --git a/tests/fx-fft/misc.h b/tests/fx-fft/misc.h
diff --git a/tests/helloworld/helloworld.mk b/tests/helloworld/helloworld.mk
@@ -9,7 +9,6 @@ HELLOWORLD_PLATFORMS += m85-an555
 
 # C sources required for this test
 HELLOWORLD_SOURCES += main.c
-HELLOWORLD_SOURCES += misc.c
 
 # Assembly sources required for this test
 HELLOWORLD_ASMS += mve_test.s

diff --git a/tests/helloworld/misc.c b/tests/helloworld/misc.c
diff --git a/tests/helloworld/misc.h b/tests/helloworld/misc.h
diff --git a/tests/intmulntt/intmulntt.mk b/tests/intmulntt/intmulntt.mk
@@ -9,8 +9,6 @@ INTMULNTT_PLATFORMS += m85-an555
 
 # C sources required for this test
 INTMULNTT_SOURCES += main.c
-INTMULNTT_SOURCES += misc.c
-INTMULNTT_SOURCES += poly.c
 
 # Assembly sources required for this test
 INTMULNTT_ASMS += crt.s

diff --git a/tests/intmulntt/misc.c b/tests/intmulntt/misc.c
diff --git a/tests/intmulntt/misc.h b/tests/intmulntt/misc.h
diff --git a/tests/intmulntt/poly.c b/tests/intmulntt/poly.c
diff --git a/tests/intmulntt/poly.h b/tests/intmulntt/poly.h
diff --git a/tests/karatsuba/karatsuba.mk b/tests/karatsuba/karatsuba.mk
@@ -9,7 +9,6 @@ KARATSUBA_PLATFORMS += m85-an555
 
 # C sources required for this test
 KARATSUBA_SOURCES += main.c
-KARATSUBA_SOURCES += misc.c
 
 # Assembly sources required for this test
 KARATSUBA_ASMS += karatsuba.s

diff --git a/tests/karatsuba/misc.c b/tests/karatsuba/misc.c
diff --git a/tests/karatsuba/misc.h b/tests/karatsuba/misc.h
diff --git a/tests/karatsuba/poly.h b/tests/karatsuba/poly.h
diff --git a/tests/montgomery/misc.c b/tests/montgomery/misc.c
diff --git a/tests/montgomery/misc.h b/tests/montgomery/misc.h
diff --git a/tests/montgomery/montgomery.mk b/tests/montgomery/montgomery.mk
@@ -9,8 +9,6 @@ MONTGOMERY_PLATFORMS += m85-an555
 
 # C sources required for this test
 MONTGOMERY_SOURCES += main.c
-MONTGOMERY_SOURCES += misc.c
-MONTGOMERY_SOURCES += poly.c
 
 # Assembly sources required for this test
 MONTGOMERY_ASMS += montgomery.s

diff --git a/tests/montgomery/poly.c b/tests/montgomery/poly.c
diff --git a/tests/montgomery/poly.h b/tests/montgomery/poly.h
diff --git a/tests/ntt-1024/misc.c b/tests/ntt-1024/misc.c
diff --git a/tests/ntt-1024/misc.h b/tests/ntt-1024/misc.h
diff --git a/tests/ntt-1024/ntt-1024.mk b/tests/ntt-1024/ntt-1024.mk
@@ -9,8 +9,6 @@ NTT_1024_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_1024_SOURCES += main.c
-NTT_1024_SOURCES += misc.c
-NTT_1024_SOURCES += poly.c
 
 # Assembly sources required for this test
 NTT_1024_ASM_DIR = ../../asm/auto/ntt_1024

diff --git a/tests/ntt-1024/poly.c b/tests/ntt-1024/poly.c
diff --git a/tests/ntt-1024/poly.h b/tests/ntt-1024/poly.h
diff --git a/tests/ntt-192/misc.c b/tests/ntt-192/misc.c
diff --git a/tests/ntt-192/misc.h b/tests/ntt-192/misc.h
diff --git a/tests/ntt-192/ntt-192.mk b/tests/ntt-192/ntt-192.mk
@@ -9,8 +9,6 @@ NTT_192_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_192_SOURCES += main.c
-NTT_192_SOURCES += misc.c
-NTT_192_SOURCES += poly.c
 
 # Assembly sources required for this test
 NTT_192_ASM_DIR = ../../asm/auto/ntt_192

diff --git a/tests/ntt-192/poly.c b/tests/ntt-192/poly.c
diff --git a/tests/ntt-192/poly.h b/tests/ntt-192/poly.h
diff --git a/tests/ntt-256/misc.c b/tests/ntt-256/misc.c
diff --git a/tests/ntt-256/misc.h b/tests/ntt-256/misc.h
diff --git a/tests/ntt-256/ntt-256.mk b/tests/ntt-256/ntt-256.mk
@@ -9,8 +9,6 @@ NTT_256_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_256_SOURCES += main.c
-NTT_256_SOURCES += misc.c
-NTT_256_SOURCES += poly.c
 
 # Assembly sources required for this test
 NTT_256_ASM_DIR = ../../asm/auto/ntt_256

diff --git a/tests/ntt-256/poly.c b/tests/ntt-256/poly.c
diff --git a/tests/ntt-256/poly.h b/tests/ntt-256/poly.h
diff --git a/tests/ntt-384/misc.c b/tests/ntt-384/misc.c
diff --git a/tests/ntt-384/misc.h b/tests/ntt-384/misc.h
diff --git a/tests/ntt-384/ntt-384.mk b/tests/ntt-384/ntt-384.mk
@@ -9,8 +9,6 @@ NTT_384_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_384_SOURCES += main.c
-NTT_384_SOURCES += misc.c
-NTT_384_SOURCES += poly.c
 
 # Assembly sources required for this test
 NTT_384_ASM_DIR = ../../asm/auto/ntt_384

diff --git a/tests/ntt-384/poly.c b/tests/ntt-384/poly.c
diff --git a/tests/ntt-384/poly.h b/tests/ntt-384/poly.h
diff --git a/tests/ntt-512/misc.c b/tests/ntt-512/misc.c
diff --git a/tests/ntt-512/misc.h b/tests/ntt-512/misc.h
diff --git a/tests/ntt-512/ntt-512.mk b/tests/ntt-512/ntt-512.mk
@@ -9,8 +9,6 @@ NTT_512_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_512_SOURCES += main.c
-NTT_512_SOURCES += misc.c
-NTT_512_SOURCES += poly.c
 
 # Assembly sources required for this test
 NTT_512_ASM_DIR = ../../asm/auto/ntt_512

diff --git a/tests/ntt-512/poly.c b/tests/ntt-512/poly.c
diff --git a/tests/ntt-512/poly.h b/tests/ntt-512/poly.h
diff --git a/tests/ntt-768/misc.c b/tests/ntt-768/misc.c
diff --git a/tests/ntt-768/misc.h b/tests/ntt-768/misc.h
diff --git a/tests/ntt-768/ntt-768.mk b/tests/ntt-768/ntt-768.mk
@@ -11,8 +11,6 @@ NTT_768_PLATFORMS += m55-an547
 
 # C sources required for this test
 NTT_768_SOURCES += main.c
-NTT_768_SOURCES += misc.c
-NTT_768_SOURCES += poly.c
 
 # Assembly sources required for this test
 NTT_768_ASM_DIR = ../../asm/auto/ntt_768

diff --git a/tests/ntt-768/poly.c b/tests/ntt-768/poly.c
diff --git a/tests/ntt-768/poly.h b/tests/ntt-768/poly.h
diff --git a/tests/ntt-dilithium/misc.c b/tests/ntt-dilithium/misc.c
diff --git a/tests/ntt-dilithium/misc.h b/tests/ntt-dilithium/misc.h
diff --git a/tests/ntt-dilithium/ntt-dilithium.mk b/tests/ntt-dilithium/ntt-dilithium.mk
@@ -9,8 +9,6 @@ NTT_DILITHIUM_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_DILITHIUM_SOURCES += main.c
-NTT_DILITHIUM_SOURCES += poly.c
-NTT_DILITHIUM_SOURCES += misc.c
 
 # Assembly sources required for this test
 NTT_DILITHIUM_ASM_DIR = ../../asm/manual/ntt_dilithium

diff --git a/tests/ntt-dilithium/poly.c b/tests/ntt-dilithium/poly.c
diff --git a/tests/ntt-dilithium/poly.h b/tests/ntt-dilithium/poly.h
diff --git a/tests/ntt-kyber/misc.c b/tests/ntt-kyber/misc.c
diff --git a/tests/ntt-kyber/misc.h b/tests/ntt-kyber/misc.h
diff --git a/tests/ntt-kyber/ntt-kyber.mk b/tests/ntt-kyber/ntt-kyber.mk
@@ -9,8 +9,6 @@ NTT_KYBER_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_KYBER_SOURCES += main.c
-NTT_KYBER_SOURCES += poly.c
-NTT_KYBER_SOURCES += misc.c
 
 # Assembly sources required for this test
 NTT_KYBER_ASM_DIR=../../asm/manual/ntt_kyber

diff --git a/tests/ntt-kyber/poly.c b/tests/ntt-kyber/poly.c
diff --git a/tests/ntt-kyber/poly.h b/tests/ntt-kyber/poly.h
diff --git a/tests/ntt-n256/misc.c b/tests/ntt-n256/misc.c
diff --git a/tests/ntt-n256/misc.h b/tests/ntt-n256/misc.h
diff --git a/tests/ntt-n256/ntt-n256.mk b/tests/ntt-n256/ntt-n256.mk
@@ -9,8 +9,6 @@ NTT_N256_PLATFORMS += m85-an555
 
 # C sources required for this test
 NTT_N256_SOURCES += main.c
-NTT_N256_SOURCES += misc.c
-NTT_N256_SOURCES += poly.c
 
 # Assembly sources required for this test
 NTT_N256_ASM_DIR = ../../asm/auto/ntt_n256

diff --git a/tests/ntt-n256/poly.c b/tests/ntt-n256/poly.c
diff --git a/tests/ntt-n256/poly.h b/tests/ntt-n256/poly.h
diff --git a/tests/permute/misc.c b/tests/permute/misc.c
diff --git a/tests/permute/misc.h b/tests/permute/misc.h
diff --git a/tests/permute/permute.mk b/tests/permute/permute.mk
@@ -9,7 +9,6 @@ PERMUTE_PLATFORMS += m85-an555
 
 # C sources required for this test
 PERMUTE_SOURCES += main.c
-PERMUTE_SOURCES += misc.c
 
 # Assembly sources required for this test
 PERMUTE_ASM_DIR = ../../asm/auto/permute

diff --git a/tests/poly/misc.c b/tests/poly/misc.c
diff --git a/tests/poly/misc.h b/tests/poly/misc.h
diff --git a/tests/poly/poly.c b/tests/poly/poly.c