From e063dc3c21edd90cdf4a70efdf5df92ffe7c050c Mon Sep 17 00:00:00 2001 From: ouankou Date: Sun, 15 Mar 2026 04:35:25 +0000 Subject: [PATCH 1/2] Use LLVM 22 defaults in OpenMP extraction scripts --- tests/extract_openmp_examples_pragmas.sh | 10 +++++----- tests/extract_openmp_vv_pragmas.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/extract_openmp_examples_pragmas.sh b/tests/extract_openmp_examples_pragmas.sh index 5be8a767..4c9b14f6 100755 --- a/tests/extract_openmp_examples_pragmas.sh +++ b/tests/extract_openmp_examples_pragmas.sh @@ -5,11 +5,11 @@ # This script extracts OpenMP pragmas from the official OpenMP Examples # repository and saves them as test files for our parser. # -# IMPORTANT: This script MUST be run with LLVM toolchain (default: LLVM 20): -# CC=clang-20 CXX=clang++-20 FC=flang-20 ./extract_openmp_examples_pragmas.sh +# IMPORTANT: This script MUST be run with LLVM toolchain (default: LLVM 22): +# CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_examples_pragmas.sh # # To use a different LLVM version: -# LLVM_VERSION=21 CC=clang-21 CXX=clang++-21 FC=flang-21 ./extract_openmp_examples_pragmas.sh +# LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_examples_pragmas.sh # # The script will: # 1. Wipe the tests/openmp_examples/ directory completely @@ -29,7 +29,7 @@ set -euo pipefail # Configuration -LLVM_VERSION="${LLVM_VERSION:-20}" # Default to LLVM 20, can be overridden +LLVM_VERSION="${LLVM_VERSION:-22}" # Default to LLVM 22, can be overridden REPO_URL="https://github.com/OpenMP/Examples" REPO_PATH="build/openmp_examples" OUTPUT_DIR="tests/openmp_examples" @@ -58,7 +58,7 @@ REQUIRED_FC="flang-${LLVM_VERSION}" if [ "${CC:-}" != "$REQUIRED_CC" ] && [ "${CC:-}" != "clang" ]; then echo -e "${RED}ERROR: CC must be set to ${REQUIRED_CC}${NC}" echo "Usage: CC=${REQUIRED_CC} CXX=${REQUIRED_CXX} FC=${REQUIRED_FC} $0" - echo "Or: LLVM_VERSION=21 CC=clang-21 CXX=clang++-21 FC=flang-21 $0" + echo "Or: LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 $0" exit 1 fi diff --git a/tests/extract_openmp_vv_pragmas.sh b/tests/extract_openmp_vv_pragmas.sh index 03a80248..6979a56a 100755 --- a/tests/extract_openmp_vv_pragmas.sh +++ b/tests/extract_openmp_vv_pragmas.sh @@ -5,11 +5,11 @@ # This script extracts OpenMP pragmas from the OpenMP Validation & Verification # test suite and saves them as individual test files for our parser. # -# IMPORTANT: This script MUST be run with LLVM toolchain (default: LLVM 20): -# CC=clang-20 CXX=clang++-20 FC=flang-20 ./extract_openmp_vv_pragmas.sh +# IMPORTANT: This script MUST be run with LLVM toolchain (default: LLVM 22): +# CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_vv_pragmas.sh # # To use a different LLVM version: -# LLVM_VERSION=21 CC=clang-21 CXX=clang++-21 FC=flang-21 ./extract_openmp_vv_pragmas.sh +# LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_vv_pragmas.sh # # The script will: # 1. Wipe the tests/openmp_vv/ directory completely @@ -29,7 +29,7 @@ set -euo pipefail # Configuration -LLVM_VERSION="${LLVM_VERSION:-20}" # Default to LLVM 20, can be overridden +LLVM_VERSION="${LLVM_VERSION:-22}" # Default to LLVM 22, can be overridden REPO_URL="https://github.com/OpenMP-Validation-and-Verification/OpenMP_VV" REPO_PATH="build/openmp_vv" TESTS_DIR="tests" @@ -60,7 +60,7 @@ REQUIRED_CLANG_FORMAT="clang-format-${LLVM_VERSION}" if [ "${CC:-}" != "$REQUIRED_CC" ] && [ "${CC:-}" != "clang" ]; then echo -e "${RED}ERROR: CC must be set to ${REQUIRED_CC}${NC}" echo "Usage: CC=${REQUIRED_CC} CXX=${REQUIRED_CXX} FC=${REQUIRED_FC} $0" - echo "Or: LLVM_VERSION=21 CC=clang-21 CXX=clang++-21 FC=flang-21 $0" + echo "Or: LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 $0" exit 1 fi From 9b3a9a29d740ec0861071dd1aaa286c821a4e4f1 Mon Sep 17 00:00:00 2001 From: ouankou Date: Sun, 15 Mar 2026 04:57:00 +0000 Subject: [PATCH 2/2] Clarify non-default LLVM override examples --- tests/extract_openmp_examples_pragmas.sh | 4 ++-- tests/extract_openmp_vv_pragmas.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/extract_openmp_examples_pragmas.sh b/tests/extract_openmp_examples_pragmas.sh index 4c9b14f6..ce56ba76 100755 --- a/tests/extract_openmp_examples_pragmas.sh +++ b/tests/extract_openmp_examples_pragmas.sh @@ -9,7 +9,7 @@ # CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_examples_pragmas.sh # # To use a different LLVM version: -# LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_examples_pragmas.sh +# LLVM_VERSION= CC=clang- CXX=clang++- FC=flang- ./extract_openmp_examples_pragmas.sh # # The script will: # 1. Wipe the tests/openmp_examples/ directory completely @@ -58,7 +58,7 @@ REQUIRED_FC="flang-${LLVM_VERSION}" if [ "${CC:-}" != "$REQUIRED_CC" ] && [ "${CC:-}" != "clang" ]; then echo -e "${RED}ERROR: CC must be set to ${REQUIRED_CC}${NC}" echo "Usage: CC=${REQUIRED_CC} CXX=${REQUIRED_CXX} FC=${REQUIRED_FC} $0" - echo "Or: LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 $0" + echo "Or: LLVM_VERSION= CC=clang- CXX=clang++- FC=flang- $0" exit 1 fi diff --git a/tests/extract_openmp_vv_pragmas.sh b/tests/extract_openmp_vv_pragmas.sh index 6979a56a..0f046481 100755 --- a/tests/extract_openmp_vv_pragmas.sh +++ b/tests/extract_openmp_vv_pragmas.sh @@ -9,7 +9,7 @@ # CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_vv_pragmas.sh # # To use a different LLVM version: -# LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 ./extract_openmp_vv_pragmas.sh +# LLVM_VERSION= CC=clang- CXX=clang++- FC=flang- ./extract_openmp_vv_pragmas.sh # # The script will: # 1. Wipe the tests/openmp_vv/ directory completely @@ -60,7 +60,7 @@ REQUIRED_CLANG_FORMAT="clang-format-${LLVM_VERSION}" if [ "${CC:-}" != "$REQUIRED_CC" ] && [ "${CC:-}" != "clang" ]; then echo -e "${RED}ERROR: CC must be set to ${REQUIRED_CC}${NC}" echo "Usage: CC=${REQUIRED_CC} CXX=${REQUIRED_CXX} FC=${REQUIRED_FC} $0" - echo "Or: LLVM_VERSION=22 CC=clang-22 CXX=clang++-22 FC=flang-22 $0" + echo "Or: LLVM_VERSION= CC=clang- CXX=clang++- FC=flang- $0" exit 1 fi