@@ -80,9 +80,13 @@ set(TARGET_NAME ${COMMON_CLANG_LIBRARY_NAME}${BUILD_PLATFORM} )
80
80
if (NOT USE_PREBUILT_LLVM)
81
81
82
82
if (NOT LLVM_EXTERNAL_CLANG_SOURCE_DIR)
83
+ set (LLVM_BASE_REVISION release_13)
83
84
set (CLANG_SOURCE_DIR ${LLVM_SOURCE_DIR} /tools/clang)
85
+ set (CLANG_BASE_REVISION release_13)
84
86
elseif (EXISTS "${LLVM_EXTERNAL_CLANG_SOURCE_DIR} /CMakeLists.txt" )
87
+ set (LLVM_BASE_REVISION release/13.x)
85
88
set (CLANG_SOURCE_DIR "${LLVM_EXTERNAL_CLANG_SOURCE_DIR} " )
89
+ set (CLANG_BASE_REVISION release/13.x)
86
90
endif ()
87
91
if (EXISTS ${CLANG_SOURCE_DIR} )
88
92
message (STATUS "[OPENCL-CLANG] Using Clang source code direcotry: ${CLANG_SOURCE_DIR} " )
@@ -116,19 +120,22 @@ if(NOT USE_PREBUILT_LLVM)
116
120
"out at `llvm/projects/llvm-spirv`"
117
121
)
118
122
endif ()
119
-
120
- set (CLANG_BASE_REVISION master)
121
- set (SPIRV_BASE_REVISION master)
122
- set (TARGET_BRANCH "ocl-open-110" )
123
-
124
- apply_patches(${CLANG_SOURCE_DIR}
125
- ${CMAKE_CURRENT_SOURCE_DIR} /patches/clang
126
- ${CLANG_BASE_REVISION}
127
- ${TARGET_BRANCH} )
123
+
124
+ set (SPIRV_BASE_REVISION llvm_release_130)
125
+ set (TARGET_BRANCH "ocl-open-130" )
126
+ get_filename_component (LLVM_MONOREPO_DIR ${LLVM_SOURCE_DIR} DIRECTORY )
127
+ set (LLVM_PATCHES_DIRS ${CMAKE_CURRENT_SOURCE_DIR} /patches/llvm
128
+ ${CMAKE_CURRENT_SOURCE_DIR} /patches/clang)
129
+ apply_patches(${LLVM_MONOREPO_DIR}
130
+ "${LLVM_PATCHES_DIRS} "
131
+ ${LLVM_BASE_REVISION}
132
+ ${TARGET_BRANCH}
133
+ ret)
128
134
apply_patches(${SPIRV_SOURCE_DIR}
129
135
${CMAKE_CURRENT_SOURCE_DIR} /patches/spirv
130
136
${SPIRV_BASE_REVISION}
131
- ${TARGET_BRANCH} )
137
+ ${TARGET_BRANCH}
138
+ ret)
132
139
endif (NOT USE_PREBUILT_LLVM)
133
140
134
141
#
0 commit comments