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.

Sign up for GitHub

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

tmp/cling upgrade v1.1 #359

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

tmp/cling upgrade v1.1 #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e92dc4c
Update cling in ci to version 1.1 using root llvm 16
mcbarton Nov 29, 2024
bb10c03
Only build gtest_main for cling llvm=13 ci
mcbarton Nov 29, 2024
05f2544
Disable CUDA tests for Cling
mcbarton Nov 29, 2024
0d9e21d
Apply patch needed to fix error handling for cling version 1.1
mcbarton Nov 30, 2024
dbc5d38
Update cling16-1-Error-Handling.patch to add blank line
mcbarton Nov 30, 2024
1055a9c
Update job names
mcbarton Dec 1, 2024
985fea8
Increase CI debug timeout to 2hrs
Vipul-Cariappa Dec 2, 2024
45d8655
build in debug
Vipul-Cariappa Dec 2, 2024
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
82 changes: 50 additions & 32 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ jobs:
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
- name: ubu22-x86-gcc9-clang13-cling
- name: ubu22-x86-gcc12-clang16-cling
os: ubuntu-22.04
compiler: gcc-9
clang-runtime: '13'
compiler: gcc-12
clang-runtime: '16'
cling: On
cling-version: '1.0'
cling-version: '1.1'
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
Expand Down Expand Up @@ -118,12 +118,12 @@ jobs:
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
- name: osx14-arm-clang-clang13-cling
- name: osx14-arm-clang-clang16-cling
os: macos-14
compiler: clang
clang-runtime: '13'
clang-runtime: '16'
cling: On
cling-version: '1.0'
cling-version: '1.1'
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
Expand Down Expand Up @@ -159,12 +159,12 @@ jobs:
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
- name: osx13-x86-clang-clang13-cling
- name: osx13-x86-clang-clang16-cling
os: macos-13
compiler: clang
clang-runtime: '13'
clang-runtime: '16'
cling: On
cling-version: '1.0'
cling-version: '1.1'
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
- name: Setup default Build Type on *nux
if: ${{ runner.os != 'windows' && steps.cache.outputs.cache-hit != 'true' }}
run: |
echo "BUILD_TYPE=Release" >> $GITHUB_ENV
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
echo "CODE_COVERAGE=0" >> $GITHUB_ENV
os="${{ matrix.os }}"
if [[ "${os}" == "macos"* ]]; then
Expand Down Expand Up @@ -366,6 +366,13 @@ jobs:
git clone https://github.com/root-project/cling.git
cd ./cling
git checkout tags/v${{ matrix.cling-version }}
# Apply patches
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
if [[ "${llvm_vers}" == "16" ]]; then
# cling version 1.1 with llvm 16 requires a patch to fix error handling when parsing invaild code
git apply -v ../patches/llvm/cling${{ matrix.clang-runtime }}-*.patch
echo "Apply cling${{ matrix.clang-runtime }}-*.patch patches:"
fi
cd ..
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
else # repl
Expand All @@ -380,7 +387,7 @@ jobs:
-DLLVM_EXTERNAL_PROJECTS=cling \
-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling \
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=Debug \
-DLLVM_ENABLE_ASSERTIONS=ON \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DCLANG_ENABLE_ARCMT=OFF \
Expand All @@ -392,8 +399,10 @@ jobs:
../llvm
cmake --build . --target clang --parallel ${{ env.ncpus }}
cmake --build . --target cling --parallel ${{ env.ncpus }}
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
if [[ "${{ matrix.clang-runtime}}" == "13" ]]; then
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
cmake --build . --target gtest_main --parallel ${{ env.ncpus }}
fi
else
# Apply patches
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
Expand Down Expand Up @@ -433,6 +442,11 @@ jobs:
git clone https://github.com/root-project/cling.git
cd ./cling
git checkout tags/v${{ matrix.cling-version }}
if ( "${{ matrix.clang-runtime }}" -imatch "16" )
{
# cling version 1.1 with llvm 16 requires a patch to fix error handling when parsing invaild code
git apply -v clang16-1-Error-Handling.patch
}
cd ..
git clone --depth=1 -b cling-llvm${{ matrix.clang-runtime }} https://github.com/root-project/llvm-project.git
$env:PWD_DIR= $PWD.Path
Expand Down Expand Up @@ -466,8 +480,12 @@ jobs:
..\llvm
cmake --build . --config Release --target clang --parallel ${{ env.ncpus }}
cmake --build . --config Release --target cling --parallel ${{ env.ncpus }}
# Now build gtest.a and gtest_main for CppInterOp to run its tests.
cmake --build . --config Release --target gtest_main --parallel ${{ env.ncpus }}
if ( "${{ matrix.clang-runtime }}" -imatch "13" )
{
# cling version 1.0 with llvm 13 doesn't work on Windows, but this is here in
# case someone finds a way to fix this
cmake --build . --config Release --target gtest_main --parallel ${{ env.ncpus }}
}
}
else
{
Expand Down Expand Up @@ -552,13 +570,13 @@ jobs:
clang-runtime: '16'
cling: Off
cppyy: Off
- name: ubu22-x86-gcc9-clang13-cling-cppyy
- name: ubu22-x86-gcc12-clang16-cling
os: ubuntu-22.04
compiler: gcc-9
clang-runtime: '13'
compiler: gcc-12
clang-runtime: '16'
cling: On
cling-version: '1.0'
cppyy: On
cling-version: '1.1'
cppyy: Off
#FIXME: Windows CppInterOp tests expected to fail
#until https://github.com/compiler-research/CppInterOp/issues/188 is solved
- name: win2022-msvc-clang-repl-19
Expand Down Expand Up @@ -609,13 +627,13 @@ jobs:
clang-runtime: '16'
cling: Off
cppyy: Off
- name: osx14-arm-clang-clang13-cling-cppyy
- name: osx14-arm-clang-clang16-cling
os: macos-14
compiler: clang
clang-runtime: '13'
clang-runtime: '16'
cling: On
cling-version: '1.0'
cppyy: On
cling-version: '1.1'
cppyy: Off
- name: osx13-x86-clang-clang-repl-19-cppyy
os: macos-13
compiler: clang
Expand All @@ -640,13 +658,13 @@ jobs:
clang-runtime: '16'
cling: Off
cppyy: Off
- name: osx13-x86-clang-clang13-cling-cppyy
- name: osx13-x86-clang-clang16-cling
os: macos-13
compiler: clang
clang-runtime: '13'
clang-runtime: '16'
cling: On
cling-version: '1.0'
cppyy: On
cling-version: '1.1'
cppyy: Off

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -710,7 +728,7 @@ jobs:
- name: Setup default Build Type on *nux
if: runner.os != 'windows'
run: |
echo "BUILD_TYPE=Release" >> $GITHUB_ENV
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
echo "CODE_COVERAGE=0" >> $GITHUB_ENV
os="${{ matrix.os }}"
if [[ "${os}" == "macos"* ]]; then
Expand Down Expand Up @@ -1131,7 +1149,7 @@ jobs:
if: ${{ failure() && runner.debug }}
uses: mxschmitt/action-tmate@v3
# When debugging increase to a suitable value!
timeout-minutes: 30
timeout-minutes: 120

emscripten_wasm_CppInterOp_and_xeus_cpp:
needs: [build_cache]
Expand Down Expand Up @@ -1194,7 +1212,7 @@ jobs:
- name: Setup default Build Type on *nux
if: runner.os != 'windows'
run: |
echo "BUILD_TYPE=Release" >> $GITHUB_ENV
echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
echo "CODE_COVERAGE=0" >> $GITHUB_ENV
os="${{ matrix.os }}"
if [[ "${os}" == "macos"* ]]; then
Expand Down
17 changes: 17 additions & 0 deletions patches/llvm/cling16-1-Error-Handling.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/lib/Interpreter/IncrementalParser.cpp b/lib/Interpreter/IncrementalParser.cpp
index 89cd78d..2aea40d 100644
--- a/lib/Interpreter/IncrementalParser.cpp
+++ b/lib/Interpreter/IncrementalParser.cpp
@@ -911,8 +911,11 @@ namespace cling {
PP.EnterSourceFile(FID, /*DirLookup*/nullptr, NewLoc);
m_Consumer->getTransaction()->setBufferFID(FID);

- if (!ParseOrWrapTopLevelDecl())
+ llvm::Expected<bool> res = ParseOrWrapTopLevelDecl();
+ if (!res) {
+ llvm::consumeError(std::move(res.takeError()));
return kFailed;
+ }

if (PP.getLangOpts().DelayedTemplateParsing) {
// Microsoft-specific:
12 changes: 10 additions & 2 deletions unittests/CppInterOp/CUDATest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ using namespace TestUtils;

static bool HasCudaSDK() {
auto supportsCudaSDK = []() {
#if CLANG_VERSION_MAJOR < 16
#ifdef USE_CLING
// FIXME: Enable this for cling.
return false;
#elif CLANG_VERSION_MAJOR < 16
// FIXME: Enable this for cling.
return false;
#endif // CLANG_VERSION_MAJOR < 16
Expand All @@ -23,7 +26,10 @@ static bool HasCudaSDK() {

static bool HasCudaRuntime() {
auto supportsCuda = []() {
#if CLANG_VERSION_MAJOR < 16
#ifdef USE_CLING
// FIXME: Enable this for cling.
return false;
#elif CLANG_VERSION_MAJOR < 16
// FIXME: Enable this for cling.
return false;
#endif //CLANG_VERSION_MAJOR < 16
Expand All @@ -43,6 +49,8 @@ static bool HasCudaRuntime() {

#if CLANG_VERSION_MAJOR < 16
TEST(DISABLED_CUDATest, Sanity) {
#elif USE_CLING
TEST(DISABLED_CUDATest, Sanity) {
#else
TEST(CUDATest, Sanity) {
#endif // CLANG_VERSION_MAJOR < 16
Expand Down
Loading