Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix edge case in decoder when very first OP is QOI_OP_RUN / Add CI with official test suite #23

Merged
merged 3 commits into from
Feb 24, 2024
Merged

Fix edge case in decoder when very first OP is QOI_OP_RUN / Add CI with official test suite #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
337fca5
add CI with official test suite
wx257osn2 Feb 21, 2024
31ee62b
test before run
wx257osn2 Feb 24, 2024
9c3a254
fix edge case in decoder when very first op is QOI_OP_RUN
wx257osn2 Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 40 additions & 6 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,51 @@ jobs:
- id: cached
uses: andstor/file-existence-action@v3
with:
files: images
- name: get benchmark suite
files: "images, qoi_test_images"
- name: get test/benchmark suite
if: steps.cached.outputs.files_exists == 'false'
shell: bash
run: curl https://qoiformat.org/benchmark/qoi_benchmark_suite.tar | tar x
run: |
curl -O https://qoiformat.org/qoi_test_images.zip
unzip qoi_test_images.zip
rm qoi_test_images.zip
curl https://qoiformat.org/benchmark/qoi_benchmark_suite.tar | tar x
- name: build reference qoiconv
shell: bash
run: |
pushd .dependencies/qoi
ln -s ../stb/stb_image.h .
ln -s ../stb/stb_image_write.h .
make conv
popd
mv .dependencies/qoi/qoiconv bin/qoiconv_orig
- name: build
shell: bash
run: CXX=clang++-17 make -j
- name: test
shell: bash
run: |
pushd qoi_test_images
mkdir -p /tmp/qoixx
mkdir -p /tmp/qoi
for i in ./*.qoi; do
# test decode
../bin/qoiconv ${i} /tmp/qoixx/${i%.*}.png
../bin/qoiconv_orig ${i} /tmp/qoi/${i%.*}.png
diff /tmp/qoi{,xx}/${i%.*}.png
done
rm -rf /tmp/qoixx/*.png
rm -rf /tmp/qoi/*.png
for i in ./*.png; do
# test encode
../bin/qoiconv ${i} /tmp/qoixx/${i%.*}.qoi
../bin/qoiconv_orig /tmp/qoixx/${i%.*}.qoi /tmp/qoixx/${i}
../bin/qoiconv_orig ${i} /tmp/qoi/${i%.*}.qoi
../bin/qoiconv_orig /tmp/qoi/${i%.*}.qoi /tmp/qoi/${i}
diff /tmp/qoi{,xx}/${i}
done
popd
bin/test
- name: run
shell: bash
run: bin/qoibench 1 images --noreference --nowarmup
- name: test
shell: bash
run: bin/test
46 changes: 40 additions & 6 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,51 @@ jobs:
- id: cached
uses: andstor/file-existence-action@v3
with:
files: images
- name: get benchmark suite
files: "images, qoi_test_images"
- name: get test/benchmark suite
if: steps.cached.outputs.files_exists == 'false'
shell: bash
run: curl https://qoiformat.org/benchmark/qoi_benchmark_suite.tar | tar x
run: |
curl -O https://qoiformat.org/qoi_test_images.zip
unzip qoi_test_images.zip
rm qoi_test_images.zip
curl https://qoiformat.org/benchmark/qoi_benchmark_suite.tar | tar x
- name: build reference qoiconv
shell: bash
run: |
pushd .dependencies/qoi
ln -s ../stb/stb_image.h .
ln -s ../stb/stb_image_write.h .
make conv
popd
mv .dependencies/qoi/qoiconv bin/qoiconv_orig
- name: build
shell: bash
run: CXX=$(brew --prefix llvm@17)/bin/clang++ make -j
- name: test
shell: bash
run: |
pushd qoi_test_images
mkdir -p /tmp/qoixx
mkdir -p /tmp/qoi
for i in ./*.qoi; do
# test decode
../bin/qoiconv ${i} /tmp/qoixx/${i%.*}.png
../bin/qoiconv_orig ${i} /tmp/qoi/${i%.*}.png
diff /tmp/qoi{,xx}/${i%.*}.png
done
rm -rf /tmp/qoixx/*.png
rm -rf /tmp/qoi/*.png
for i in ./*.png; do
# test encode
../bin/qoiconv ${i} /tmp/qoixx/${i%.*}.qoi
../bin/qoiconv_orig /tmp/qoixx/${i%.*}.qoi /tmp/qoixx/${i}
../bin/qoiconv_orig ${i} /tmp/qoi/${i%.*}.qoi
../bin/qoiconv_orig /tmp/qoi/${i%.*}.qoi /tmp/qoi/${i}
diff /tmp/qoi{,xx}/${i}
done
popd
bin/test
- name: run
shell: bash
run: bin/qoibench 1 images --noreference --nowarmup
- name: test
shell: bash
run: bin/test
50 changes: 43 additions & 7 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
install: >-
git
curl
unzip
diffutils
mingw-w64-ucrt-x86_64-make
mingw-w64-ucrt-x86_64-clang
- uses: actions/checkout@v4
Expand All @@ -29,17 +31,51 @@ jobs:
- id: cached
uses: andstor/file-existence-action@v3
with:
files: images
- name: get benchmark suite
files: "images, qoi_test_images"
- name: get test/benchmark suite
if: steps.cached.outputs.files_exists == 'false'
shell: bash
run: curl https://qoiformat.org/benchmark/qoi_benchmark_suite.tar | tar x
shell: msys2 {0}
run: |
curl -O https://qoiformat.org/qoi_test_images.zip
unzip qoi_test_images.zip
rm qoi_test_images.zip
curl https://qoiformat.org/benchmark/qoi_benchmark_suite.tar | tar x
- name: build reference qoiconv
shell: msys2 {0}
run: |
pushd .dependencies/qoi
ln -s ../stb/stb_image.h .
ln -s ../stb/stb_image_write.h .
mingw32-make conv
popd
mv .dependencies/qoi/qoiconv.exe bin/qoiconv_orig.exe
- name: build
shell: msys2 {0}
run: CXX=clang++ mingw32-make -j
- name: test
shell: msys2 {0}
run: |
pushd qoi_test_images
mkdir -p /tmp/qoixx
mkdir -p /tmp/qoi
for i in ./*.qoi; do
# test decode
../bin/qoiconv ${i} /tmp/qoixx/${i%.*}.png
../bin/qoiconv_orig ${i} /tmp/qoi/${i%.*}.png
diff /tmp/qoi{,xx}/${i%.*}.png
done
rm -rf /tmp/qoixx/*.png
rm -rf /tmp/qoi/*.png
for i in ./*.png; do
# test encode
../bin/qoiconv ${i} /tmp/qoixx/${i%.*}.qoi
../bin/qoiconv_orig /tmp/qoixx/${i%.*}.qoi /tmp/qoixx/${i}
../bin/qoiconv_orig ${i} /tmp/qoi/${i%.*}.qoi
../bin/qoiconv_orig /tmp/qoi/${i%.*}.qoi /tmp/qoi/${i}
diff /tmp/qoi{,xx}/${i}
done
popd
bin/test
- name: run
shell: msys2 {0}
run: bin/qoibench 1 images --noreference --nowarmup
- name: test
shell: msys2 {0}
run: bin/test
13 changes: 11 additions & 2 deletions include/qoixx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include<bit>
#include<numeric>
#include<array>
#include<utility>

#ifndef QOIXX_NO_SIMD
#if defined(__ARM_FEATURE_SVE)
Expand Down Expand Up @@ -1146,7 +1147,7 @@ class qoi{
static constexpr auto hash_diff_table = luma_hash_diff_table.data() + hash_table_offset;
)

const auto f = [&pixels, &p, &px_len, &size, &px, &index QOIXX_HPP_WITH_TABLES(, &hash)]{
const auto f = [&pixels, &p, &px_len, &size, &px, &index QOIXX_HPP_WITH_TABLES(, &hash)](bool first){
static constexpr std::uint32_t mask_tail_6 = 0b0011'1111u;
[[maybe_unused]] static constexpr std::uint32_t mask_tail_4 = 0b0000'1111u;
[[maybe_unused]] static constexpr std::uint32_t mask_tail_2 = 0b0000'0011u;
Expand Down Expand Up @@ -1187,6 +1188,13 @@ class qoi{
run = px_len;
px_len -= run;
QOIXX_HPP_DECODE_RUN(px, run)
if(first)[[unlikely]]{
QOIXX_HPP_WITH_TABLES(hash = (0*3+0*5+0*7+255*11) % index_size;)
if constexpr(std::is_same<rgba_t, qoi::rgba_t>::value)
index[QOIXX_HPP_WITH_TABLES(hash) QOIXX_HPP_WITHOUT_TABLES((0*3+0*5+0*7+255*11) % index_size)] = px;
else
efficient_memcpy<Channels>(index + QOIXX_HPP_WITH_TABLES(hash) QOIXX_HPP_WITHOUT_TABLES((0*3+0*5+0*7+255*11) % index_size), &px);
}
return;
}
if(b1 == chunk_tag::rgb){
Expand Down Expand Up @@ -1271,8 +1279,9 @@ class qoi{
push<Channels>(pixels, &px);
};

bool first = true;
while(px_len--)[[likely]]{
f();
f(std::exchange(first, false));
if(size < sizeof(padding))[[unlikely]]{
throw std::runtime_error("qoixx::qoi::decode: insufficient input data");
}
Expand Down
Loading