From 01be4d6b9d0b0bbb50623b96e26c18f6030e0368 Mon Sep 17 00:00:00 2001
From: Grzegorz Swirski <grzegorz@swirski.name>
Date: Sun, 24 Sep 2023 22:23:38 +0200
Subject: [PATCH] refactor: move arch specific code to rpo folder, don't run
 SVE on CI

---
 .github/workflows/ci.yml            |  4 ++--
 .pre-commit-config.yaml             |  4 ++--
 arch/arm64-sve/CMakeLists.txt       | 10 ----------
 arch/arm64-sve/{ => rpo}/library.c  |  0
 arch/arm64-sve/{ => rpo}/library.h  |  0
 arch/arm64-sve/{ => rpo}/rpo_hash.h |  0
 arch/arm64-sve/test.c               | 27 ---------------------------
 build.rs                            |  8 ++++----
 8 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 arch/arm64-sve/CMakeLists.txt
 rename arch/arm64-sve/{ => rpo}/library.c (100%)
 rename arch/arm64-sve/{ => rpo}/library.h (100%)
 rename arch/arm64-sve/{ => rpo}/rpo_hash.h (100%)
 delete mode 100644 arch/arm64-sve/test.c

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ee9fb3..2ff1609 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
       matrix:
         toolchain: [stable, nightly]
         os: [ubuntu]
-        features: [--all-features, --no-default-features]
+        features: ["--features default,std,serde", --no-default-features]
     steps:
       - uses: actions/checkout@main
       - name: Install rust
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        features: [--all-features, --no-default-features]
+        features: ["--features default,std,serde", --no-default-features]
     steps:
       - uses: actions/checkout@main
       - name: Install minimal nightly with clippy
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d00cf26..4f909e8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,8 +35,8 @@ repos:
       name: Cargo check --all-targets --no-default-features
       args: ["+stable", "check", "--all-targets", "--no-default-features"]
     - id: cargo
-      name: Cargo check --all-targets --all-features
-      args: ["+stable", "check", "--all-targets", "--all-features"]
+      name: Cargo check --all-targets --features default,std,serde
+      args: ["+stable", "check", "--all-targets", "--features", "default,std,serde"]
     # Unlike fmt, clippy will not be automatically applied
     - id: cargo
       name: Cargo clippy
diff --git a/arch/arm64-sve/CMakeLists.txt b/arch/arm64-sve/CMakeLists.txt
deleted file mode 100644
index 40710b1..0000000
--- a/arch/arm64-sve/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(rpo_sve C)
-
-set(CMAKE_C_STANDARD 23)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+sve -Wall -Wextra -pedantic -g -O3")
-
-add_library(rpo_sve library.c rpo_hash.h)
-
-add_executable(rpo_test test.c)
-target_link_libraries(rpo_test rpo_sve)
diff --git a/arch/arm64-sve/library.c b/arch/arm64-sve/rpo/library.c
similarity index 100%
rename from arch/arm64-sve/library.c
rename to arch/arm64-sve/rpo/library.c
diff --git a/arch/arm64-sve/library.h b/arch/arm64-sve/rpo/library.h
similarity index 100%
rename from arch/arm64-sve/library.h
rename to arch/arm64-sve/rpo/library.h
diff --git a/arch/arm64-sve/rpo_hash.h b/arch/arm64-sve/rpo/rpo_hash.h
similarity index 100%
rename from arch/arm64-sve/rpo_hash.h
rename to arch/arm64-sve/rpo/rpo_hash.h
diff --git a/arch/arm64-sve/test.c b/arch/arm64-sve/test.c
deleted file mode 100644
index 78e2f50..0000000
--- a/arch/arm64-sve/test.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-#include "library.h"
-
-void print_array(size_t len, uint64_t arr[len]);
-
-int main() {
-    uint64_t C[STATE_WIDTH] = {1, 1, 1, 1 ,1, 1, 1, 1 ,1, 1, 1, 1};
-    uint64_t T[STATE_WIDTH] = {1, 2, 3, 4, 1, 2, 3, 4,1, 2, 3, 4};
-
-    add_constants_and_apply_sbox(T, C);
-    add_constants_and_apply_inv_sbox(T, C);
-
-    print_array(STATE_WIDTH, T);
-
-    return 0;
-}
-
-void print_array(size_t len, uint64_t arr[len])
-{
-    printf("[");
-    for (size_t i = 0; i < len; i++)
-    {
-        printf("%lu ", arr[i]);
-    }
-
-    printf("]\n");
-}
diff --git a/build.rs b/build.rs
index 7d95857..f65f075 100644
--- a/build.rs
+++ b/build.rs
@@ -5,12 +5,12 @@ fn main() {
 
 #[cfg(feature = "arch-arm64-sve")]
 fn compile_arch_arm64_sve() {
-    println!("cargo:rerun-if-changed=arch/arm64-sve/library.c");
-    println!("cargo:rerun-if-changed=arch/arm64-sve/library.h");
-    println!("cargo:rerun-if-changed=arch/arm64-sve/rpo_hash.h");
+    println!("cargo:rerun-if-changed=arch/arm64-sve/rpo/library.c");
+    println!("cargo:rerun-if-changed=arch/arm64-sve/rpo/library.h");
+    println!("cargo:rerun-if-changed=arch/arm64-sve/rpo/rpo_hash.h");
 
     cc::Build::new()
-        .file("arch/arm64-sve/library.c")
+        .file("arch/arm64-sve/rpo/library.c")
         .flag("-march=armv8-a+sve")
         .flag("-O3")
         .compile("rpo_sve");