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.

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

Remove unnecessary SIMD test log #553

Merged
merged 3 commits into from
Mar 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 6 additions & 10 deletions .github/workflows/build_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/post_weekly_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Editor and engineering scratch files
.cache
.vs
.vscode
.DS_Store
Expand Down
4 changes: 0 additions & 4 deletions Source/UnitTest/test_simd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1999,10 +1999,6 @@ TEST(vint4, vtable4_64x8)

vint4 result = vtable_lookup_32bit(table, index);

uint8_t* hack = reinterpret_cast<uint8_t*>(&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);
Expand Down
8 changes: 6 additions & 2 deletions Source/astcenc_vecmathlib_avx2_8.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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]);
}

/**
Expand Down
8 changes: 6 additions & 2 deletions Source/astcenc_vecmathlib_common_4.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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]);
}

/**
Expand Down