chores: cleanup for submission tag

Integer-Ctrl · Integer-Ctrl · commit c6eca17cb5da · 2025-04-30T19:01:36.000+02:00
diff --git a/docs_sphinx/submissions/report_25_05_01.rst b/docs_sphinx/submissions/report_25_05_01.rst
diff --git a/submissions/submission_25_05_01/CMakeLists.txt b/submissions/submission_25_05_01/CMakeLists.txt
@@ -54,21 +54,21 @@ set(SRC_FILES
     neon_1_1.s
     neon_1_2.s
 
-    neon_2_1_simple.s
-    neon_2_1_unrolled.s
+    neon_2_simple.s
+    neon_2_unrolled.s
 
     neon_3_1.s
     neon_3_2.s
     neon_3_3.s
 )
 
 set(TEST_FILES
-    neon_2_1.test.cpp
+    neon_2.test.cpp
     neon_3.test.cpp
 )
 
 set(BENCH_FILES
-    neon_2_1.bench.cpp
+    neon_2.bench.cpp
     neon_3.bench.cpp
 )
 
@@ -80,8 +80,8 @@ add_executable(neon_1_2 "${SRC_FILES}"
     neon_1_2_driver.cpp
 )
 
-add_executable(neon_2_1 "${SRC_FILES}"
-    neon_2_1_driver.cpp
+add_executable(neon_2 "${SRC_FILES}"
+    neon_2_driver.cpp
 )
 
 # add_executable(loops "${SRC_FILES}")
diff --git a/submissions/submission_25_05_01/neon_2.bench.cpp b/submissions/submission_25_05_01/neon_2.bench.cpp
@@ -1,5 +1,5 @@
 #include <benchmark/benchmark.h>
-#include "neon_2_1.h"
+#include "neon_2.h"
 
 class Gemm16x6x1Fixture : public benchmark::Fixture
 {
diff --git a/submissions/submission_25_05_01/neon_2.h b/submissions/submission_25_05_01/neon_2.h
@@ -1,5 +1,5 @@
-#ifndef MLC_NEON_2_1_H
-#define MLC_NEON_2_1_H
+#ifndef MLC_neon_2_H
+#define MLC_neon_2_H
 
 #include <cstdint>
 #include <cstdlib>
@@ -61,4 +61,4 @@ void fill_matmul_16_6_1(float * __restrict__ a, float * __restrict__ b, float *
         verify_c[i] = c[i];
     }
 }
-#endif // MLC_NEON_2_1_H
+#endif // MLC_neon_2_H
diff --git a/submissions/submission_25_05_01/neon_2.test.cpp b/submissions/submission_25_05_01/neon_2.test.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 #include <cstdint>
-#include "neon_2_1.h"
+#include "neon_2.h"
 
 void verify_matmul_16_6_1(const float *__restrict__ expected, const float *__restrict__ result)
 {
@@ -14,7 +14,7 @@ void verify_matmul_16_6_1(const float *__restrict__ expected, const float *__res
     }
 }
 
-TEST_CASE("Test 16x6x1 simple gemm correctness random data", "[neon_2_1][correctness][gemm]")
+TEST_CASE("Test 16x6x1 simple gemm correctness random data", "[neon_2][correctness][gemm]")
 {
     float matrix_a[16 * 1];
     float matrix_b[1 * 6];
@@ -30,7 +30,7 @@ TEST_CASE("Test 16x6x1 simple gemm correctness random data", "[neon_2_1][correct
     verify_matmul_16_6_1(matrix_c_verify, matrix_c);
 }
 
-TEST_CASE("Test 16x6x1 unrolled gemm correctness random data", "[neon_2_1][correctness][gemm]")
+TEST_CASE("Test 16x6x1 unrolled gemm correctness random data", "[neon_2][correctness][gemm]")
 {
     float matrix_a[16 * 1];
     float matrix_b[1 * 6];
diff --git a/submissions/submission_25_05_01/neon_2_driver.cpp b/submissions/submission_25_05_01/neon_2_driver.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <cstdint>
-#include "neon_2_1.h"
+#include "neon_2.h"
 
 void matmul_16_6_1(const float *__restrict__ a, const float *__restrict__ b, float *__restrict__ c,
                    int64_t lda, int64_t ldb, int64_t ldc)
diff --git a/submissions/submission_25_05_01/neon_2_simple.s b/submissions/submission_25_05_01/neon_2_simple.s
diff --git a/submissions/submission_25_05_01/neon_2_unrolled.s b/submissions/submission_25_05_01/neon_2_unrolled.s
diff --git a/submissions/submission_25_05_01/neon_3_1.s b/submissions/submission_25_05_01/neon_3_1.s
@@ -1,4 +1,4 @@
-// using the neon_2_1_unrolled as base kernel as it is the fast based on benchmarks
+// using the neon_2_unrolled as base kernel as it is the fast based on benchmarks
 
 /**
     * @param x0 = a pointer to column-major 16x64 matrix A.
diff --git a/submissions/submission_25_05_01/neon_3_2.s b/submissions/submission_25_05_01/neon_3_2.s
@@ -1,4 +1,4 @@
-// using the neon_2_1_unrolled as base kernel as it is the fast based on benchmarks
+// using the neon_2_unrolled as base kernel as it is the fast based on benchmarks
 
 /**
     * @param x0 = a pointer to column-major 64x64 matrix A.
diff --git a/submissions/submission_25_05_01/neon_3_3.s b/submissions/submission_25_05_01/neon_3_3.s
@@ -1,4 +1,4 @@
-// using the neon_2_1_unrolled as base kernel as it is the fast based on benchmarks
+// using the neon_2_unrolled as base kernel as it is the fast based on benchmarks
 
 /**
     * @param x0 = a pointer to column-major 64x64 matrix A.

Original file line number	Diff line number	Diff line change
`@@ -54,21 +54,21 @@ set(SRC_FILES`
`54`	`54`	`neon_1_1.s`
`55`	`55`	`neon_1_2.s`
`56`	`56`
`57`		`- neon_2_1_simple.s`
`58`		`- neon_2_1_unrolled.s`
	`57`	`+ neon_2_simple.s`
	`58`	`+ neon_2_unrolled.s`
`59`	`59`
`60`	`60`	`neon_3_1.s`
`61`	`61`	`neon_3_2.s`
`62`	`62`	`neon_3_3.s`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`set(TEST_FILES`
`66`		`- neon_2_1.test.cpp`
	`66`	`+ neon_2.test.cpp`
`67`	`67`	`neon_3.test.cpp`
`68`	`68`	`)`
`69`	`69`
`70`	`70`	`set(BENCH_FILES`
`71`		`- neon_2_1.bench.cpp`
	`71`	`+ neon_2.bench.cpp`
`72`	`72`	`neon_3.bench.cpp`
`73`	`73`	`)`
`74`	`74`
`@@ -80,8 +80,8 @@ add_executable(neon_1_2 "${SRC_FILES}"`
`80`	`80`	`neon_1_2_driver.cpp`
`81`	`81`	`)`
`82`	`82`
`83`		`-add_executable(neon_2_1 "${SRC_FILES}"`
`84`		`- neon_2_1_driver.cpp`
	`83`	`+add_executable(neon_2 "${SRC_FILES}"`
	`84`	`+ neon_2_driver.cpp`
`85`	`85`	`)`
`86`	`86`
`87`	`87`	`# add_executable(loops "${SRC_FILES}")`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#include <benchmark/benchmark.h>`
`2`		`-#include "neon_2_1.h"`
	`2`	`+#include "neon_2.h"`
`3`	`3`
`4`	`4`	`class Gemm16x6x1Fixture : public benchmark::Fixture`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-#ifndef MLC_NEON_2_1_H`
`2`		`-#define MLC_NEON_2_1_H`
	`1`	`+#ifndef MLC_neon_2_H`
	`2`	`+#define MLC_neon_2_H`
`3`	`3`
`4`	`4`	`#include <cstdint>`
`5`	`5`	`#include <cstdlib>`
`@@ -61,4 +61,4 @@ void fill_matmul_16_6_1(float * __restrict__ a, float * __restrict__ b, float *`
`61`	`61`	`verify_c[i] = c[i];`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`-#endif // MLC_NEON_2_1_H`
	`64`	`+#endif // MLC_neon_2_H`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#include <catch2/catch_test_macros.hpp>`
`2`	`2`	`#include <catch2/matchers/catch_matchers_floating_point.hpp>`
`3`	`3`	`#include <cstdint>`
`4`		`-#include "neon_2_1.h"`
	`4`	`+#include "neon_2.h"`
`5`	`5`
`6`	`6`	`void verify_matmul_16_6_1(const float __restrict__ expected, const float __restrict__ result)`
`7`	`7`	`{`
`@@ -14,7 +14,7 @@ void verify_matmul_16_6_1(const float __restrict__ expected, const float __res`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-TEST_CASE("Test 16x6x1 simple gemm correctness random data", "[neon_2_1][correctness][gemm]")`
	`17`	`+TEST_CASE("Test 16x6x1 simple gemm correctness random data", "[neon_2][correctness][gemm]")`
`18`	`18`	`{`
`19`	`19`	`float matrix_a[16 * 1];`
`20`	`20`	`float matrix_b[1 * 6];`
`@@ -30,7 +30,7 @@ TEST_CASE("Test 16x6x1 simple gemm correctness random data", "[neon_2_1][correct`
`30`	`30`	`verify_matmul_16_6_1(matrix_c_verify, matrix_c);`
`31`	`31`	`}`
`32`	`32`
`33`		`-TEST_CASE("Test 16x6x1 unrolled gemm correctness random data", "[neon_2_1][correctness][gemm]")`
	`33`	`+TEST_CASE("Test 16x6x1 unrolled gemm correctness random data", "[neon_2][correctness][gemm]")`
`34`	`34`	`{`
`35`	`35`	`float matrix_a[16 * 1];`
`36`	`36`	`float matrix_b[1 * 6];`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// using the neon_2_1_unrolled as base kernel as it is the fast based on benchmarks`
	`1`	`+// using the neon_2_unrolled as base kernel as it is the fast based on benchmarks`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* @param x0 = a pointer to column-major 16x64 matrix A.`