diff --git a/.github/workflows/build_test.yaml b/.github/workflows/build_test.yaml index d47f5da1..2dc8614f 100644 --- a/.github/workflows/build_test.yaml +++ b/.github/workflows/build_test.yaml @@ -55,18 +55,16 @@ jobs: pip install numpy Pillow - name: Run system tests - # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here + # Disable SVE for now run: | python ./Test/astc_test_functional.py --encoder none python ./Test/astc_test_functional.py --encoder neon - python ./Test/astc_test_functional.py --encoder sve_128 python ./Test/astc_test_image.py --encoder none --test-set Small python ./Test/astc_test_image.py --encoder neon --test-set Small - python ./Test/astc_test_image.py --encoder sve_128 --test-set Small - name: Run unit tests - # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here - run: ctest -E test-unit-sve_256 --rerun-failed --output-on-failure + # Disable SVE for now + run: ctest -E "test-unit-sve_128|test-unit-sve_256" --rerun-failed --output-on-failure working-directory: build_rel build-ubuntu-arm64-gcc: @@ -113,18 +111,16 @@ jobs: pip install numpy Pillow - name: Run system tests - # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here + # Disable SVE for now run: | python ./Test/astc_test_functional.py --encoder none python ./Test/astc_test_functional.py --encoder neon - python ./Test/astc_test_functional.py --encoder sve_128 python ./Test/astc_test_image.py --encoder none --test-set Small python ./Test/astc_test_image.py --encoder neon --test-set Small - python ./Test/astc_test_image.py --encoder sve_128 --test-set Small - name: Run unit tests - # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here - run: ctest -E test-unit-sve_256 --rerun-failed --output-on-failure + # Disable SVE for now + run: ctest -E "test-unit-sve_128|test-unit-sve_256" --rerun-failed --output-on-failure working-directory: build_rel build-ubuntu-x64-clang: diff --git a/.github/workflows/post_weekly_release.yaml b/.github/workflows/post_weekly_release.yaml index 05b6a3f8..49c718bb 100644 --- a/.github/workflows/post_weekly_release.yaml +++ b/.github/workflows/post_weekly_release.yaml @@ -101,12 +101,10 @@ jobs: pip install numpy Pillow - name: Run system tests - # GitHub is using Cobalt-100, which has 128-bit SVE so we cannot test sve_256 here + # Disable SVE testing for now run: | python ./Test/astc_test_functional.py --encoder neon - python ./Test/astc_test_functional.py --encoder sve_128 python ./Test/astc_test_image.py --encoder neon --test-set Small - python ./Test/astc_test_image.py --encoder sve_128 --test-set Small build-ubuntu-x64: name: Ubuntu x64 diff --git a/.gitignore b/.gitignore index 0c52d28b..09a73277 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # Editor and engineering scratch files +.cache .vs .vscode .DS_Store diff --git a/Source/UnitTest/test_simd.cpp b/Source/UnitTest/test_simd.cpp index fcb9b7af..c49c23fd 100644 --- a/Source/UnitTest/test_simd.cpp +++ b/Source/UnitTest/test_simd.cpp @@ -1999,10 +1999,6 @@ TEST(vint4, vtable4_64x8) vint4 result = vtable_lookup_32bit(table, index); - uint8_t* hack = reinterpret_cast(&table); - std::cout << "38: " << hack[38] << "\n"; - std::cout << "63: " << hack[63] << "\n"; - EXPECT_EQ(result.lane<0>(), 0); EXPECT_EQ(result.lane<1>(), 7); EXPECT_EQ(result.lane<2>(), 38); diff --git a/Source/astcenc_vecmathlib_avx2_8.h b/Source/astcenc_vecmathlib_avx2_8.h index b400b313..4c96c7c5 100644 --- a/Source/astcenc_vecmathlib_avx2_8.h +++ b/Source/astcenc_vecmathlib_avx2_8.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2019-2024 Arm Limited +// Copyright 2019-2025 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -1176,8 +1176,12 @@ ASTCENC_SIMD_INLINE void printx(vint8 a) { alignas(32) int v[8]; storea(a, v); + + unsigned int uv[8]; + std::memcpy(uv, v, sizeof(int) * 8); + printf("v8_i32:\n %08x %08x %08x %08x %08x %08x %08x %08x\n", - v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]); + uv[0], uv[1], uv[2], uv[3], uv[4], uv[5], uv[6], uv[7]); } /** diff --git a/Source/astcenc_vecmathlib_common_4.h b/Source/astcenc_vecmathlib_common_4.h index db4f13a6..152d3fc3 100644 --- a/Source/astcenc_vecmathlib_common_4.h +++ b/Source/astcenc_vecmathlib_common_4.h @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 // ---------------------------------------------------------------------------- -// Copyright 2020-2024 Arm Limited +// Copyright 2020-2025 Arm Limited // // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy @@ -380,8 +380,12 @@ ASTCENC_SIMD_INLINE void printx(vint4 a) { ASTCENC_ALIGNAS int v[4]; storea(a, v); + + unsigned int uv[4]; + std::memcpy(uv, v, sizeof(int) * 4); + printf("v4_i32:\n %08x %08x %08x %08x\n", - v[0], v[1], v[2], v[3]); + uv[0], uv[1], uv[2], uv[3]); } /**