Skip to content

Commit 7f09c52

Browse files
austinvhuangaustinvhuang
committed
2 parents f516543 + e82dc40 commit 7f09c52

File tree

6 files changed

+167
-88
lines changed

6 files changed

+167
-88
lines changed

‎.gitignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,16 @@ source
99
third_party/lib/libdawn.*
1010
third_party/lib/*.so
1111
third_party/lib/*.dylib
12+
third_party/local/*
13+
14+
# formatter files
15+
.cmake-format.py
16+
17+
# cmake build directories
18+
out
19+
build
20+
21+
# clangd files
22+
.cache
23+
compile_commands.json
24+

‎CMakeLists.txt‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,44 @@ project(gpu)
33

44
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/webgpu.cmake")
55

6-
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # export compile_commands.json to use with LSP
6+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # export compile_commands.json to use with
7+
# LSP
78
set(CMAKE_CXX_STANDARD 17)
89
set(CMAKE_CXX_STANDARD_REQUIRED ON)
910

10-
option(USE_LOCAL_LIBS "Use local libraries instead of fetching from the internet" OFF)
11+
option(USE_LOCAL_LIBS
12+
"Use local libraries instead of fetching from the internet" OFF)
1113

1214
# Ensure the build type is set
1315
if(NOT CMAKE_BUILD_TYPE)
14-
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build: Debug or Release" FORCE)
16+
set(CMAKE_BUILD_TYPE
17+
Release
18+
CACHE STRING "Choose the type of build: Debug or Release" FORCE)
1519
endif()
1620

1721
option(FASTBUILD "Option to enable fast builds" OFF)
1822
if(FASTBUILD)
19-
set(CMAKE_BUILD_TYPE None) # Avoid default flags of predefined build types
20-
set(CMAKE_CXX_FLAGS "-O0")
23+
set(CMAKE_BUILD_TYPE None) # Avoid default flags of predefined build types
24+
set(CMAKE_CXX_FLAGS "-O0")
2125
endif()
2226

2327
option(DEBUG "Option to enable debug flags" OFF)
2428
if(DEBUG)
25-
set(CMAKE_BUILD_TYPE Debug)
26-
set(CMAKE_CXX_FLAGS "-O0 -g")
29+
set(CMAKE_BUILD_TYPE Debug)
30+
set(CMAKE_CXX_FLAGS "-O0 -g")
2731
endif()
2832

2933
if(WIN64)
30-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
34+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
3135
endif()
3236

3337
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/gpu.cmake")
3438

3539
message(STATUS "CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
36-
message(STATUS "Include directories for wgpu: ${CMAKE_CURRENT_SOURCE_DIR}/third_party/headers")
40+
message(
41+
STATUS
42+
"Include directories for wgpu: ${CMAKE_CURRENT_SOURCE_DIR}/third_party/headers"
43+
)
3744

3845
add_library(gpud SHARED gpu.h)
3946
set_target_properties(gpud PROPERTIES LINKER_LANGUAGE CXX)

‎cmake/example.cmake‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # export compile_commands.json to use with LSP
1+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # export compile_commands.json to use with
2+
# LSP
23
set(CMAKE_CXX_STANDARD 17)
34
set(CMAKE_CXX_STANDARD_REQUIRED ON)
45

@@ -9,37 +10,47 @@ get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
910
set(FILEPATH_CURRENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
1011
set(FILEPATH_PROJECT_ROOT "${PROJECT_ROOT}/${FILENAME}")
1112

13+
# Include file finding utility script
14+
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_gpu.cmake")
15+
1216
# Check if the file exists in the current directory
13-
if(EXISTS ${FILEPATH_CURRENT_DIR})
14-
set(TARGET_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
15-
elseif(EXISTS ${FILEPATH_PROJECT_ROOT})
16-
set(TARGET_FILE_PATH ${PROJECT_ROOT})
17-
else()
18-
message(FATAL_ERROR "File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../")
17+
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILENAME}
18+
TARGET_FILE_PATH)
19+
if("${TARGET_FILE_PATH}" STREQUAL "")
20+
find_project_root(${FILEPATH_CURRENT_DIR} ${FILENAME}
21+
TARGET_FILE_PATH)
22+
if("${TARGET_FILE_PATH}" STREQUAL "")
23+
message(
24+
FATAL_ERROR
25+
"File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../"
26+
)
27+
endif()
1928
endif()
2029

2130
# Ensure the build type is set
2231
if(NOT CMAKE_BUILD_TYPE)
23-
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build: Debug or Release" FORCE)
32+
set(CMAKE_BUILD_TYPE
33+
Release
34+
CACHE STRING "Choose the type of build: Debug or Release" FORCE)
2435
endif()
2536

2637
# Define architecture and build type directories or file names
2738
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
28-
set(ARCH "x64")
39+
set(ARCH "x64")
2940
else()
30-
set(ARCH "x86")
41+
set(ARCH "x86")
3142
endif()
3243

3344
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
34-
set(BUILD_TYPE "Debug")
45+
set(BUILD_TYPE "Debug")
3546
else()
36-
set(BUILD_TYPE "Release")
47+
set(BUILD_TYPE "Release")
3748
endif()
3849

3950
if(NOT TARGET gpu)
40-
message(STATUS "GPU_LIB not found")
41-
include("${TARGET_FILE_PATH}/cmake/webgpu.cmake")
42-
include("${TARGET_FILE_PATH}/cmake/gpu.cmake")
51+
message(STATUS "GPU_LIB not found")
52+
include("${TARGET_FILE_PATH}/cmake/webgpu.cmake")
53+
include("${TARGET_FILE_PATH}/cmake/gpu.cmake")
4354
endif()
4455

4556
add_executable(${PROJECT_NAME} run.cpp)
@@ -48,9 +59,10 @@ target_link_libraries(${PROJECT_NAME} PRIVATE wgpu)
4859
target_link_libraries(${PROJECT_NAME} PRIVATE webgpu)
4960

5061
if(WIN32)
51-
# Ensure DLL is copied if on Windows
52-
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
53-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
54-
${DLL_PATH}
55-
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
56-
endif()
62+
# Ensure DLL is copied if on Windows
63+
add_custom_command(
64+
TARGET ${PROJECT_NAME}
65+
POST_BUILD
66+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DLL_PATH}
67+
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
68+
endif()

‎cmake/find_gpu.cmake‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# file name to find
2+
set(FILENAME "gpu.h")
3+
4+
# Function to check for file existence up the directory hierarchy
5+
function(find_project_root current_dir filename result_var)
6+
set(found FALSE) # Flag to indicate if the file is found
7+
set(current_check_dir "${current_dir}") # Start from the given directory
8+
# using 1 is jsut to supress the cmane-format warning
9+
foreach(i RANGE 0 2 1)
10+
set(filepath "${current_check_dir}/${filename}")
11+
12+
if(EXISTS "${filepath}")
13+
set(${result_var}
14+
"${current_check_dir}"
15+
PARENT_SCOPE)
16+
set(found TRUE)
17+
break()
18+
endif()
19+
20+
# Move one level up
21+
get_filename_component(current_check_dir "${current_check_dir}"
22+
DIRECTORY)
23+
endforeach()
24+
25+
if(NOT found)
26+
set(${result_var}
27+
""
28+
PARENT_SCOPE) # Set to empty if not found
29+
endif()
30+
endfunction()

‎cmake/gpu.cmake‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
1-
# Specify the filename to search for
2-
set(FILENAME "gpu.h")
3-
41
get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
52
get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
63

74
# Construct potential paths
85
set(FILEPATH_CURRENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
96
set(FILEPATH_PROJECT_ROOT "${PROJECT_ROOT}/${FILENAME}")
107

8+
# Include file finding utility script
9+
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_gpu.cmake")
10+
1111
# Check if the file exists in the current directory
12-
if(EXISTS ${FILEPATH_CURRENT_DIR})
13-
set(TARGET_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
14-
elseif(EXISTS ${FILEPATH_PROJECT_ROOT})
15-
set(TARGET_FILE_PATH ${PROJECT_ROOT})
16-
else()
17-
message(FATAL_ERROR "File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../")
12+
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILENAME} TARGET_FILE_PATH)
13+
if("${TARGET_FILE_PATH}" STREQUAL "")
14+
find_project_root(${FILEPATH_CURRENT_DIR} ${FILENAME} TARGET_FILE_PATH)
15+
if("${TARGET_FILE_PATH}" STREQUAL "")
16+
message(
17+
FATAL_ERROR
18+
"File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../"
19+
)
20+
endif()
1821
endif()
1922

2023
# Define architecture and build type directories or file names
2124
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
22-
set(ARCH "x64")
25+
set(ARCH "x64")
2326
else()
24-
set(ARCH "x86")
27+
set(ARCH "x86")
2528
endif()
2629

2730
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
28-
set(BUILD_TYPE "Debug")
31+
set(BUILD_TYPE "Debug")
2932
else()
30-
set(BUILD_TYPE "Release")
33+
set(BUILD_TYPE "Release")
3134
endif()
3235

3336
add_library(webgpulib SHARED IMPORTED)
@@ -38,22 +41,29 @@ add_dependencies(gpu webgpulib)
3841
target_include_directories(gpu INTERFACE ${TARGET_FILE_PATH})
3942

4043
# Add headers webgpu.h
41-
target_include_directories(wgpu INTERFACE ${TARGET_FILE_PATH}/third_party/headers)
42-
if(WIN32)
43-
set(DLL_PATH "${TARGET_FILE_PATH}/third_party/lib/libdawn_${ARCH}_${BUILD_TYPE}.dll")
44-
if(EXISTS ${DLL_PATH})
45-
file(COPY ${DLL_PATH} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
46-
target_link_libraries(webgpulib INTERFACE ${DLL_PATH})
47-
else()
48-
message(FATAL_ERROR "libdawn dll not found at: ${DLL_PATH}")
49-
endif()
50-
else()
51-
find_library(LIBDAWN dawn REQUIRED PATHS "${TARGET_FILE_PATH}/third_party/lib")
52-
if(LIBDAWN)
53-
message(STATUS "Found libdawn: ${LIBDAWN}")
54-
# Link against libdawn
55-
target_link_libraries(webgpulib INTERFACE ${LIBDAWN})
56-
else()
57-
message(FATAL_ERROR "libdawn not found")
58-
endif()
59-
endif()
44+
target_include_directories(wgpu
45+
INTERFACE ${TARGET_FILE_PATH}/third_party/headers)
46+
include(ExternalProject)
47+
48+
set(DAWN_EXT_PREFIX "${TARGET_FILE_PATH}/third_party/local/dawn")
49+
50+
ExternalProject_Add(
51+
dawn_project
52+
PREFIX ${DAWN_EXT_PREFIX}
53+
GIT_REPOSITORY "https://dawn.googlesource.com/dawn"
54+
GIT_TAG "main"
55+
SOURCE_DIR "${DAWN_EXT_PREFIX}/source"
56+
BINARY_DIR "${DAWN_EXT_PREFIX}/build"
57+
INSTALL_DIR "${DAWN_EXT_PREFIX}/install"
58+
GIT_SUBMODULES ""
59+
# setting cmake args doesn't work and I don't know why
60+
CONFIGURE_COMMAND
61+
${CMAKE_COMMAND} -S ${DAWN_EXT_PREFIX}/source -B
62+
${DAWN_EXT_PREFIX}/build -DDAWN_FETCH_DEPENDENCIES=ON
63+
-DDAWN_ENABLE_INSTALL=ON -DDAWN_BUILD_MONOLITHIC_LIBRARY=ON
64+
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -G ${CMAKE_GENERATOR}
65+
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix
66+
${DAWN_EXT_PREFIX}/install
67+
LOG_INSTALL ON)
68+
find_library(LIBDAWN dawn PATHS "${DAWN_EXT_PREFIX}/install/lib")
69+
target_link_libraries(webgpulib INTERFACE ${LIBDAWN})

‎cmake/webgpu.cmake‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,54 @@ get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
88
set(FILEPATH_CURRENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
99
set(FILEPATH_PROJECT_ROOT "${PROJECT_ROOT}/${FILENAME}")
1010

11+
# Include file finding utility script
12+
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_gpu.cmake")
13+
1114
# Check if the file exists in the current directory
12-
if(EXISTS ${FILEPATH_CURRENT_DIR})
13-
set(TARGET_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
14-
elseif(EXISTS ${FILEPATH_PROJECT_ROOT})
15-
set(TARGET_FILE_PATH ${PROJECT_ROOT})
16-
else()
17-
message(FATAL_ERROR "File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../")
15+
find_project_root(${CMAKE_CURRENT_SOURCE_DIR} ${FILENAME} TARGET_FILE_PATH)
16+
if("${TARGET_FILE_PATH}" STREQUAL "")
17+
find_project_root(${FILEPATH_CURRENT_DIR} ${FILENAME} TARGET_FILE_PATH)
18+
if("${TARGET_FILE_PATH}" STREQUAL "")
19+
message(
20+
FATAL_ERROR
21+
"File ${FILENAME} not found in either ${CMAKE_CURRENT_SOURCE_DIR} or ${CMAKE_CURRENT_SOURCE_DIR}/../../"
22+
)
23+
endif()
1824
endif()
1925

2026
include(FetchContent)
2127

2228
set(FETCHCONTENT_BASE_DIR "${TARGET_FILE_PATH}/third_party/fetchcontent")
23-
set(WEBGPU_DIST_LOCAL_PATH "${TARGET_FILE_PATH}/third_party/local/WebGPU-distribution")
29+
set(WEBGPU_DIST_LOCAL_PATH
30+
"${TARGET_FILE_PATH}/third_party/local/WebGPU-distribution")
2431

2532
if(USE_LOCAL_LIBS)
26-
set(WEBGPU_DIST_GIT_REPO ${WEBGPU_DIST_LOCAL_PATH})
27-
message(STATUS "Using local WebGPU distribution: ${WEBGPU_DIST_LOCAL_PATH}")
33+
set(WEBGPU_DIST_GIT_REPO ${WEBGPU_DIST_LOCAL_PATH})
34+
message(STATUS "Using local WebGPU distribution: ${WEBGPU_DIST_LOCAL_PATH}")
2835
else()
29-
set(WEBGPU_DIST_GIT_REPO "https://github.com/eliemichel/WebGPU-distribution")
36+
set(WEBGPU_DIST_GIT_REPO
37+
"https://github.com/eliemichel/WebGPU-distribution")
3038
endif()
3139

3240
option(WEBGPU_TAG "WebGPU distribution tag to use")
33-
if (NOT WEBGPU_TAG)
34-
set(WEBGPU_TAG "dawn")
41+
if(NOT WEBGPU_TAG)
42+
set(WEBGPU_TAG "dawn")
3543
endif()
3644
message(STATUS "Using WebGPU distribution tag: ${WEBGPU_TAG}")
3745

38-
if (WEBGPU_TAG STREQUAL "dawn")
39-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
40-
# use specific commit
41-
# set(WEBGPU_TAG "1025b977e1927b6d0327e67352f90feb4bcf8274")
42-
# set(WEBGPU_TAG "acf972b7b909f52e183bdae3971b93bb13d4a29e")
43-
# add_compile_options(-UABSL_INTERNAL_AT_LEAST_CXX20)
44-
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UABSL_INTERNAL_AT_LEAST_CXX20")
45-
message(STATUS "Using Dawn backend")
46+
if(WEBGPU_TAG STREQUAL "dawn")
47+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBGPU_BACKEND_DAWN")
48+
# use specific commit set(WEBGPU_TAG
49+
# "1025b977e1927b6d0327e67352f90feb4bcf8274") set(WEBGPU_TAG
50+
# "acf972b7b909f52e183bdae3971b93bb13d4a29e")
51+
# add_compile_options(-UABSL_INTERNAL_AT_LEAST_CXX20) set(CMAKE_CXX_FLAGS
52+
# "${CMAKE_CXX_FLAGS} -UABSL_INTERNAL_AT_LEAST_CXX20")
53+
message(STATUS "Using Dawn backend")
4654
endif()
4755

4856
FetchContent_Declare(
49-
webgpu
50-
GIT_REPOSITORY ${WEBGPU_DIST_GIT_REPO}
51-
GIT_TAG ${WEBGPU_TAG}
52-
GIT_SHALLOW TRUE
53-
)
54-
FetchContent_MakeAvailable(webgpu)
57+
webgpu
58+
GIT_REPOSITORY ${WEBGPU_DIST_GIT_REPO}
59+
GIT_TAG ${WEBGPU_TAG}
60+
GIT_SHALLOW TRUE)
61+
FetchContent_MakeAvailable(webgpu)

0 commit comments

Comments
 (0)