Skip to content

Commit

Permalink
Remove the cache_creator since amdvlk removed pre-navi10.
Browse files Browse the repository at this point in the history
  • Loading branch information
qiaojbao committed May 14, 2024
1 parent b7100c1 commit 899fa96
Show file tree
Hide file tree
Showing 27 changed files with 5 additions and 2,400 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* @WenqingLiAMD
# Order is important; the last matching pattern takes the most
# precedence. When someone opens a pull request that only
# modifies files under icd, only @JaxLinAMD and not the global
# owner(s) will be requested for a review.
# modifies files under icd, not the global owner(s) will be
# requested for a review.
/icd/ @JonCampbell407
38 changes: 0 additions & 38 deletions .github/workflows/check-formatting-cache-creator.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/check-xgl-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Fetch the latest prebuilt AMDVLK
run: docker pull "amdvlkadmin/$IMAGE_TAG"
- name: Build and Test with Docker
run: docker build . --file tools/cache_creator/docker/check_xgl.Dockerfile
run: docker build . --file docker/check_xgl.Dockerfile
--build-arg AMDVLK_IMAGE="amdvlkadmin/$IMAGE_TAG"
--build-arg XGL_REPO_NAME="${GITHUB_REPOSITORY}"
--build-arg XGL_REPO_REF="${GITHUB_REF}"
Expand Down
8 changes: 0 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,6 @@ add_subdirectory(icd)
# VKGC compiler
add_subdirectory(${XGL_VKGC_PATH} ${CMAKE_BINARY_DIR}/compiler)

# Cache-creator tool
if(XGL_BUILD_CACHE_CREATOR)
if(NOT ICD_BUILD_LLPC)
message(FATAL_ERROR "Cannot build cache-creator tools without LLPC")
endif()
add_subdirectory(${XGL_CACHE_CREATOR_PATH} ${CMAKE_BINARY_DIR}/tools)
endif()

### Generate Packages #################################################################################################
if(UNIX)
generateInstallTargets()
Expand Down
2 changes: 0 additions & 2 deletions cmake/XglOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ macro(xgl_options)

option(XGL_BUILD_TOOLS "Build tools?" OFF)

option(XGL_BUILD_CACHE_CREATOR "Build cache-creator tools?" OFF)

#if VKI_RAY_TRACING
option(VKI_RAY_TRACING "Build vulkan with RAY_TRACING" ON)
#endif
Expand Down
3 changes: 0 additions & 3 deletions cmake/XglOverrides.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ macro(xgl_get_path)
# icd path
set(XGL_ICD_PATH ${PROJECT_SOURCE_DIR}/icd CACHE PATH "The path of xgl, it is read-only.")

# XGL cache creator tool
set(XGL_CACHE_CREATOR_PATH ${PROJECT_SOURCE_DIR}/tools/cache_creator CACHE PATH "Path to the cache creator tool")

# PAL path
if(EXISTS ${PROJECT_SOURCE_DIR}/icd/imported/pal)
set(XGL_PAL_PATH ${PROJECT_SOURCE_DIR}/icd/imported/pal CACHE PATH "Specify the path to the PAL project.")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Dockerfile for public XGL CI with GitHub Actions.
# Sample invocation:
# docker build . --file tools/cache_creator/docker/check_xgl.Dockerfile \
# docker build . --file docker/check_xgl.Dockerfile \
# --build-arg AMDVLK_IMAGE=gcr.io/stadia-open-source/amdvlk:nightly \
# --build-arg XGL_REPO_NAME=GPUOpen-Drivers/xgl \
# --build-arg XGL_REPO_REF=<GIT_REF> \
Expand Down Expand Up @@ -38,8 +38,4 @@ WORKDIR /vulkandriver/builds/ci-build
RUN source /vulkandriver/env.sh \
&& cmake . \
&& cmake --build . \
&& cmake --build . --target amdvlk64.so cache-creator

# Run cache-creator tests.
RUN source /vulkandriver/env.sh \
&& cmake --build . --target check-cache-creator check-cache-creator-units
&& cmake --build . --target amdvlk64.so
13 changes: 0 additions & 13 deletions tools/cache_creator/.clang-format

This file was deleted.

110 changes: 0 additions & 110 deletions tools/cache_creator/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 899fa96

Please sign in to comment.