Skip to content

Commit

Permalink
Remove logging and extra toolchain files
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-forbes-cp committed Dec 18, 2024
1 parent b5d7d76 commit 64dc41e
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 47 deletions.
6 changes: 1 addition & 5 deletions .github/actions/do_build_opencl_cts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,13 @@ runs:
if: steps.calc_vars.outputs.arch == 'aarch64'
shell: bash
run: |
ls -laR
#ls -laR
set -x
sudo sed -i -e '/^deb /{h;s|deb |&[arch=amd64,i386] |p;g;s|deb http://[^ ]*|deb [arch=arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports|p;d}' /etc/apt/sources.list
sudo dpkg --add-architecture arm64
sudo apt-get install --yes gcc-11-aarch64-linux-gnu g++-11-aarch64-linux-gnu
sudo apt-get update
sudo apt-get install --yes qemu-user
echo WHICH1 && which qemu-aarch64
- name: build opencl cts
shell: bash
Expand All @@ -65,9 +64,6 @@ runs:
popd
# do build
set -x
echo WHICH2 && which qemu-aarch64
echo CAT1 && cat ${{ steps.calc_vars.outputs.toolchain }}
echo FIND1 && sudo find / -name ld-linux-aarch64.so.1 || echo NOT FOUND
cmake -G Ninja $CMAKE_TOOLCHAIN $GITHUB_WORKSPACE/OpenCL-CTS \
-DCMAKE_BUILD_TYPE=Release \
-DOPENCL_LIBRARIES=OpenCL \
Expand Down
4 changes: 0 additions & 4 deletions .github/actions/run_opencl_cts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,10 @@ runs:
cd "$GITHUB_WORKSPACE/OpenCL-CTS"
echo "Running OpenCL CTS tests with CTS file $CTS_CSV_FILE with filter $CTS_FILTER"
set -x
echo WHICH3 && which qemu-aarch64
echo FIND2 && sudo find / -name ld-linux-aarch64.so.1 || echo NOT FOUND
python -u "$GITHUB_WORKSPACE/scripts/testing/run_cities.py" -v \
--color=always --timeout $CTS_TIMEOUT \
-b "$GITHUB_WORKSPACE/test_conformance" \
-L "$GITHUB_WORKSPACE/install_icd/lib" \
-L "/usr/aarch64-linux-gnu/lib/" \
-L "/usr/aarch64-linux-gnu/" \
-e "CLC_EXECUTABLE=$GITHUB_WORKSPACE/install_ock/bin/clc" \
-e "OCL_ICD_FILENAMES=$GITHUB_WORKSPACE/install_ock/lib/libCL.so" \
-e "CL_PLATFORM_INDEX=0" \
Expand Down
29 changes: 0 additions & 29 deletions .github/toolchains/aarch64-linux.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions .github/toolchains/x86_64-linux.cmake

This file was deleted.

3 changes: 0 additions & 3 deletions platform/arm-linux/aarch64-toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,4 @@ if(NOT QEMU_AARCH64_EXECUTABLE MATCHES NOTFOUND)
set(CMAKE_CROSSCOMPILING_EMULATOR
${QEMU_AARCH64_EXECUTABLE} -L ${CMAKE_FIND_ROOT_PATH}
CACHE STRING "qemu" FORCE)
message(HERE CMAKE_CROSSCOMPILING_EMULATOR="${CMAKE_CROSSCOMPILING_EMULATOR}")
else()
message(HERE QEMU_AARCH64_EXECUTABLE MATCHES NOTFOUND)
endif()

0 comments on commit 64dc41e

Please sign in to comment.