aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Johansson <[email protected]>2020-02-12 23:08:44 +0100
committerErik Johansson <[email protected]>2020-02-12 23:08:44 +0100
commit0281f1ae16af772876a7d2f2da63328a3663d7f7 (patch)
tree01943134dbffee0a309f1f46f11315f22422bb51
parentafdaf3036b385a234fa87dbca31c0f4634e604fa (diff)
Rename assembly files (blake3-* -> blake3_*)
This gives the assembly files the same prefix as the intrinsics files which simplifies building when the build system should pick between the assembly and the intrinsics files.
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--build.rs18
-rw-r--r--c/Makefile6
-rw-r--r--c/README.md4
-rw-r--r--c/blake3_avx2-x86_64-unix.S (renamed from c/blake3-avx2-x86_64-unix.S)0
-rw-r--r--c/blake3_avx2-x86_64-windows-gnu.S (renamed from c/blake3-avx2-x86_64-windows-gnu.S)0
-rw-r--r--c/blake3_avx2-x86_64-windows-msvc.asm (renamed from c/blake3-avx2-x86_64-windows-msvc.asm)0
-rw-r--r--c/blake3_avx512-x86_64-unix.S (renamed from c/blake3-avx512-x86_64-unix.S)0
-rw-r--r--c/blake3_avx512-x86_64-windows-gnu.S (renamed from c/blake3-avx512-x86_64-windows-gnu.S)0
-rw-r--r--c/blake3_avx512-x86_64-windows-msvc.asm (renamed from c/blake3-avx512-x86_64-windows-msvc.asm)0
-rw-r--r--c/blake3_c_rust_bindings/build.rs18
-rw-r--r--c/blake3_sse41-x86_64-unix.S (renamed from c/blake3-sse41-x86_64-unix.S)0
-rw-r--r--c/blake3_sse41-x86_64-windows-gnu.S (renamed from c/blake3-sse41-x86_64-windows-gnu.S)0
-rw-r--r--c/blake3_sse41-x86_64-windows-msvc.asm (renamed from c/blake3-sse41-x86_64-windows-msvc.asm)0
14 files changed, 26 insertions, 26 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8d1fbaf..77eb1ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -118,15 +118,15 @@ jobs:
# Test the assembly implementations.
- run: make test_asm
working-directory: ./c
- - run: make clean && rm blake3-sse41-x86_64-unix.S
+ - run: make clean && rm blake3_sse41-x86_64-unix.S
working-directory: ./c
- run: BLAKE3_NO_SSE41=1 make test_asm
working-directory: ./c
- - run: make clean && rm blake3-avx2-x86_64-unix.S
+ - run: make clean && rm blake3_avx2-x86_64-unix.S
working-directory: ./c
- run: BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1 make test_asm
working-directory: ./c
- - run: make clean && rm blake3-avx512-x86_64-unix.S
+ - run: make clean && rm blake3_avx512-x86_64-unix.S
working-directory: ./c
- run: BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1 BLAKE3_NO_AVX512=1 make test_asm
working-directory: ./c
diff --git a/build.rs b/build.rs
index c5a662d..2ca559a 100644
--- a/build.rs
+++ b/build.rs
@@ -87,24 +87,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// "c_prefer_intrinsics" feature is enabled.
if is_windows_msvc() {
let mut build = new_build();
- build.file("c/blake3-sse41-x86_64-windows-msvc.asm");
- build.file("c/blake3-avx2-x86_64-windows-msvc.asm");
- build.file("c/blake3-avx512-x86_64-windows-msvc.asm");
+ build.file("c/blake3_sse41-x86_64-windows-msvc.asm");
+ build.file("c/blake3_avx2-x86_64-windows-msvc.asm");
+ build.file("c/blake3_avx512-x86_64-windows-msvc.asm");
build.compile("blake3_asm");
} else if is_windows_gnu() {
let mut build = new_build();
- build.file("c/blake3-sse41-x86_64-windows-gnu.S");
- build.file("c/blake3-avx2-x86_64-windows-gnu.S");
- build.file("c/blake3-avx512-x86_64-windows-gnu.S");
+ build.file("c/blake3_sse41-x86_64-windows-gnu.S");
+ build.file("c/blake3_avx2-x86_64-windows-gnu.S");
+ build.file("c/blake3_avx512-x86_64-windows-gnu.S");
build.compile("blake3_asm");
} else {
// All non-Windows implementations are assumed to support
// Linux-style assembly. These files do contain a small
// explicit workaround for macOS also.
let mut build = new_build();
- build.file("c/blake3-sse41-x86_64-unix.S");
- build.file("c/blake3-avx2-x86_64-unix.S");
- build.file("c/blake3-avx512-x86_64-unix.S");
+ build.file("c/blake3_sse41-x86_64-unix.S");
+ build.file("c/blake3_avx2-x86_64-unix.S");
+ build.file("c/blake3_avx512-x86_64-unix.S");
build.compile("blake3_asm");
}
} else if is_x86_64() || is_x86_32() {
diff --git a/c/Makefile b/c/Makefile
index 5cf77e4..b5929a5 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -9,21 +9,21 @@ ifdef BLAKE3_NO_SSE41
EXTRAFLAGS += -DBLAKE3_NO_SSE41
else
TARGETS += blake3_sse41.o
-ASM_TARGETS += blake3-sse41-x86_64-unix.S
+ASM_TARGETS += blake3_sse41-x86_64-unix.S
endif
ifdef BLAKE3_NO_AVX2
EXTRAFLAGS += -DBLAKE3_NO_AVX2
else
TARGETS += blake3_avx2.o
-ASM_TARGETS += blake3-avx2-x86_64-unix.S
+ASM_TARGETS += blake3_avx2-x86_64-unix.S
endif
ifdef BLAKE3_NO_AVX512
EXTRAFLAGS += -DBLAKE3_NO_AVX512
else
TARGETS += blake3_avx512.o
-ASM_TARGETS += blake3-avx512-x86_64-unix.S
+ASM_TARGETS += blake3_avx512-x86_64-unix.S
endif
ifdef BLAKE3_USE_NEON
diff --git a/c/README.md b/c/README.md
index ef7a327..b589e84 100644
--- a/c/README.md
+++ b/c/README.md
@@ -59,7 +59,7 @@ with a Unix-like OS, you can compile a working binary like this:
```bash
gcc -O3 -o example example.c blake3.c blake3_dispatch.c blake3_portable.c \
- blake3-sse41-x86_64-unix.S blake3-avx2-x86_64-unix.S blake3-avx512-x86_64-unix.S
+ blake3_sse41-x86_64-unix.S blake3_avx2-x86_64-unix.S blake3_avx512-x86_64-unix.S
```
## Building
@@ -91,7 +91,7 @@ the assembly implementations:
```bash
gcc -shared -O3 -o libblake3.so blake3.c blake3_dispatch.c blake3_portable.c \
- blake3-sse41-x86_64-unix.S blake3-avx2-x86_64-unix.S blake3-avx512-x86_64-unix.S
+ blake3_sse41-x86_64-unix.S blake3_avx2-x86_64-unix.S blake3_avx512-x86_64-unix.S
```
When building the intrinsics-based implementations, you need to build
diff --git a/c/blake3-avx2-x86_64-unix.S b/c/blake3_avx2-x86_64-unix.S
index 417a8f8..417a8f8 100644
--- a/c/blake3-avx2-x86_64-unix.S
+++ b/c/blake3_avx2-x86_64-unix.S
diff --git a/c/blake3-avx2-x86_64-windows-gnu.S b/c/blake3_avx2-x86_64-windows-gnu.S
index 73264cb..73264cb 100644
--- a/c/blake3-avx2-x86_64-windows-gnu.S
+++ b/c/blake3_avx2-x86_64-windows-gnu.S
diff --git a/c/blake3-avx2-x86_64-windows-msvc.asm b/c/blake3_avx2-x86_64-windows-msvc.asm
index 352298e..352298e 100644
--- a/c/blake3-avx2-x86_64-windows-msvc.asm
+++ b/c/blake3_avx2-x86_64-windows-msvc.asm
diff --git a/c/blake3-avx512-x86_64-unix.S b/c/blake3_avx512-x86_64-unix.S
index efeac89..efeac89 100644
--- a/c/blake3-avx512-x86_64-unix.S
+++ b/c/blake3_avx512-x86_64-unix.S
diff --git a/c/blake3-avx512-x86_64-windows-gnu.S b/c/blake3_avx512-x86_64-windows-gnu.S
index 77a8882..77a8882 100644
--- a/c/blake3-avx512-x86_64-windows-gnu.S
+++ b/c/blake3_avx512-x86_64-windows-gnu.S
diff --git a/c/blake3-avx512-x86_64-windows-msvc.asm b/c/blake3_avx512-x86_64-windows-msvc.asm
index 33fdb85..33fdb85 100644
--- a/c/blake3-avx512-x86_64-windows-msvc.asm
+++ b/c/blake3_avx512-x86_64-windows-msvc.asm
diff --git a/c/blake3_c_rust_bindings/build.rs b/c/blake3_c_rust_bindings/build.rs
index 965b715..36da7c8 100644
--- a/c/blake3_c_rust_bindings/build.rs
+++ b/c/blake3_c_rust_bindings/build.rs
@@ -60,24 +60,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// "prefer_intrinsics" feature is enabled.
if is_windows_msvc() {
let mut build = new_build();
- build.file("../blake3-sse41-x86_64-windows-msvc.asm");
- build.file("../blake3-avx2-x86_64-windows-msvc.asm");
- build.file("../blake3-avx512-x86_64-windows-msvc.asm");
+ build.file("../blake3_sse41-x86_64-windows-msvc.asm");
+ build.file("../blake3_avx2-x86_64-windows-msvc.asm");
+ build.file("../blake3_avx512-x86_64-windows-msvc.asm");
build.compile("blake3_asm");
} else if is_windows_gnu() {
let mut build = new_build();
- build.file("../blake3-sse41-x86_64-windows-gnu.S");
- build.file("../blake3-avx2-x86_64-windows-gnu.S");
- build.file("../blake3-avx512-x86_64-windows-gnu.S");
+ build.file("../blake3_sse41-x86_64-windows-gnu.S");
+ build.file("../blake3_avx2-x86_64-windows-gnu.S");
+ build.file("../blake3_avx512-x86_64-windows-gnu.S");
build.compile("blake3_asm");
} else {
// All non-Windows implementations are assumed to support
// Linux-style assembly. These files do contain a small
// explicit workaround for macOS also.
let mut build = new_build();
- build.file("../blake3-sse41-x86_64-unix.S");
- build.file("../blake3-avx2-x86_64-unix.S");
- build.file("../blake3-avx512-x86_64-unix.S");
+ build.file("../blake3_sse41-x86_64-unix.S");
+ build.file("../blake3_avx2-x86_64-unix.S");
+ build.file("../blake3_avx512-x86_64-unix.S");
build.compile("blake3_asm");
}
} else if is_x86_64() || is_x86_32() {
diff --git a/c/blake3-sse41-x86_64-unix.S b/c/blake3_sse41-x86_64-unix.S
index 1277ba4..1277ba4 100644
--- a/c/blake3-sse41-x86_64-unix.S
+++ b/c/blake3_sse41-x86_64-unix.S
diff --git a/c/blake3-sse41-x86_64-windows-gnu.S b/c/blake3_sse41-x86_64-windows-gnu.S
index e78b00e..e78b00e 100644
--- a/c/blake3-sse41-x86_64-windows-gnu.S
+++ b/c/blake3_sse41-x86_64-windows-gnu.S
diff --git a/c/blake3-sse41-x86_64-windows-msvc.asm b/c/blake3_sse41-x86_64-windows-msvc.asm
index 57b2297..57b2297 100644
--- a/c/blake3-sse41-x86_64-windows-msvc.asm
+++ b/c/blake3_sse41-x86_64-windows-msvc.asm