CVS commit: pkgsrc/parallel/opencl-clang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 22 07:55:27 UTC 2024

Modified Files:
        pkgsrc/parallel/opencl-clang: Makefile distinfo
        pkgsrc/parallel/opencl-clang/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/parallel/opencl-clang/patches: patch-cl__headers_CMakeLists.txt

Log Message:
opencl-clang: updated to 17.0.0

17.0.0
This release is linked against LLVM 17.0.1 and SPIR-V LLVM translator v17.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/parallel/opencl-clang/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/parallel/opencl-clang/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/parallel/opencl-clang/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/parallel/opencl-clang/patches/patch-cl__headers_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/opencl-clang/Makefile
diff -u pkgsrc/parallel/opencl-clang/Makefile:1.14 pkgsrc/parallel/opencl-clang/Makefile:1.15
--- pkgsrc/parallel/opencl-clang/Makefile:1.14  Thu Dec 14 13:16:05 2023
+++ pkgsrc/parallel/opencl-clang/Makefile       Mon Apr 22 07:55:27 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2023/12/14 13:16:05 adam Exp $
+# $NetBSD: Makefile,v 1.15 2024/04/22 07:55:27 adam Exp $
 
-DISTNAME=      opencl-clang-16.0.0
+DISTNAME=      opencl-clang-17.0.0
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=intel/}
 GITHUB_PROJECT=        opencl-clang    # do not remove this, it breaks cwrappers

Index: pkgsrc/parallel/opencl-clang/distinfo
diff -u pkgsrc/parallel/opencl-clang/distinfo:1.9 pkgsrc/parallel/opencl-clang/distinfo:1.10
--- pkgsrc/parallel/opencl-clang/distinfo:1.9   Thu Dec 14 13:16:05 2023
+++ pkgsrc/parallel/opencl-clang/distinfo       Mon Apr 22 07:55:27 2024
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2023/12/14 13:16:05 adam Exp $
+$NetBSD: distinfo,v 1.10 2024/04/22 07:55:27 adam Exp $
 
-BLAKE2s (opencl-clang-16.0.0.tar.gz) = cd3f135e8cb3f788680e30704d5880732da241ae6652f48670d38cff585e1c8e
-SHA512 (opencl-clang-16.0.0.tar.gz) = bf723edab7dc7a028eb79d01fd2306690a2169472760bf2783d593ffec4eb788f28f184c66b204cc074cb95a4149fcc63a1dcbee5563c620a9dc2c76bb5a2d5a
-Size (opencl-clang-16.0.0.tar.gz) = 28413 bytes
-SHA1 (patch-CMakeLists.txt) = 844cac5dedb87b2de098955cebae1bf83341d9e5
-SHA1 (patch-cl__headers_CMakeLists.txt) = fc3d935aff7314d1a194b5802c63cdb125f8ec34
+BLAKE2s (opencl-clang-17.0.0.tar.gz) = 57048e34028740ade20a606706f42ce72fc340b4dc0dd8f64eb355f91452e4cf
+SHA512 (opencl-clang-17.0.0.tar.gz) = 920e19c9c36fef1752bce46a1a240bfc0cdd22c09e5840520508c67ecd965524f5c1ce04d8879af146670377f758d3f457a8263338b84b6833e8916f10566698
+Size (opencl-clang-17.0.0.tar.gz) = 28436 bytes
+SHA1 (patch-CMakeLists.txt) = 679ddcf953a9f2343f3c454a1a7e4216e718595d

Index: pkgsrc/parallel/opencl-clang/patches/patch-CMakeLists.txt
diff -u pkgsrc/parallel/opencl-clang/patches/patch-CMakeLists.txt:1.3 pkgsrc/parallel/opencl-clang/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/parallel/opencl-clang/patches/patch-CMakeLists.txt:1.3       Thu Dec 14 13:16:06 2023
+++ pkgsrc/parallel/opencl-clang/patches/patch-CMakeLists.txt   Mon Apr 22 07:55:27 2024
@@ -1,96 +1,25 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2023/12/14 13:16:06 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2024/04/22 07:55:27 adam Exp $
 
-Revert to use add_llvm_library and revert linking LLVM libraries
-https://github.com/intel/opencl-clang/pull/438
+Change LLVM version to 17 and use major version only
+https://github.com/intel/opencl-clang/pull/487
 
---- CMakeLists.txt.orig        2023-04-13 01:08:59.000000000 +0000
+--- CMakeLists.txt.orig        2024-04-21 19:40:03.178354550 +0000
 +++ CMakeLists.txt
-@@ -292,21 +292,23 @@ else()
-   )
- endif()
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.13.4)
  
--add_library(${TARGET_NAME} SHARED
--    ${TARGET_INCLUDE_FILES}
--    ${TARGET_SOURCE_FILES}
--    $<TARGET_OBJECTS:cl_headers>
--)
--
--# Same CRT compile option are reqiured to avoid link errors on Windows.
--# MD and MDd are choosed by default for release and debug build in LLVM.
--# If users set MT or MTd flags, they also need to add the flags for
--# opencl-clang sources using a custom macro set_msvc_crt_flags.
--if(COMMAND set_msvc_crt_flags)
--    set_msvc_crt_flags(${TARGET_NAME})
-+set(EXCLUDE_LIBS_FROM_ALL "" CACHE STRING "Space-separated list of LLVM libraries to exclude from all")
-+llvm_map_components_to_libnames(ALL_LLVM_LIBS all)
-+if (NOT "${EXCLUDE_LIBS_FROM_ALL}" STREQUAL "")
-+  list(REMOVE_ITEM ALL_LLVM_LIBS ${EXCLUDE_LIBS_FROM_ALL})
- endif()
-+list(APPEND OPENCL_CLANG_LINK_LIBS ${ALL_LLVM_LIBS})
+ if(NOT DEFINED BASE_LLVM_VERSION)
+-  set(BASE_LLVM_VERSION 16.0.0)
++  set(BASE_LLVM_VERSION 17.0.0)
+ endif(NOT DEFINED BASE_LLVM_VERSION)
+ set(OPENCL_CLANG_VERSION ${BASE_LLVM_VERSION}.0)
  
--add_dependencies(${TARGET_NAME} CClangCompileOptions)
-+add_llvm_library(${TARGET_NAME} SHARED
-+  ${TARGET_INCLUDE_FILES}
-+  ${TARGET_SOURCE_FILES}
-+  $<TARGET_OBJECTS:cl_headers>
-+
-+  DEPENDS CClangCompileOptions
-+
-+  LINK_LIBS
-+    ${OPENCL_CLANG_LINK_LIBS}
-+  )
+@@ -46,7 +46,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRE
+     add_definitions(-DUSE_PREBUILT_LLVM)
  
- if (WIN32)
-     # Enable compiler generation of Control Flow Guard security checks.
-@@ -322,51 +324,6 @@ elseif(UNIX)
-         LINK_FLAGS " -Wl,--no-undefined")
- endif(WIN32)
- 
--# Enable new IN_LIST operator.
--cmake_policy(SET CMP0057 NEW)
--set(OTHER_LIBRARIES)
--if ("NVPTX" IN_LIST LLVM_TARGETS_TO_BUILD)
--    list(APPEND OTHER_LIBRARIES LLVMNVPTXCodeGen LLVMNVPTXDesc LLVMNVPTXInfo)
--endif()
--if ("AMDGPU" IN_LIST LLVM_TARGETS_TO_BUILD)
--    list(APPEND OTHER_LIBRARIES LLVMAMDGPUCodeGen LLVMAMDGPUAsmParser LLVMAMDGPUDesc LLVMAMDGPUInfo)
--endif()
--
--target_link_libraries( ${TARGET_NAME}
--                       LINK_PRIVATE
--                       ${OPENCL_CLANG_LINK_LIBS}
--                       LLVMX86CodeGen
--                       LLVMX86AsmParser
--                       LLVMX86Desc
--                       LLVMX86Info
--                       LLVMX86Disassembler
--                       LLVMAnalysis
--                       LLVMCodeGen
--                       LLVMCore
--                       LLVMipo
--                       LLVMInstCombine
--                       LLVMInstrumentation
--                       LLVMMC
--                       LLVMMCParser
--                       LLVMObjCARCOpts
--                       LLVMOption
--                       LLVMScalarOpts
--                       LLVMSupport
--                       LLVMTransformUtils
--                       LLVMVectorize
--                       LLVMAsmPrinter
--                       LLVMSelectionDAG
--                       LLVMMCDisassembler
--                       LLVMProfileData
--                       LLVMObject
--                       LLVMBitWriter
--                       LLVMIRReader
--                       LLVMAsmParser
--                       LLVMTarget
--                       LLVMBitReader
--                       ${OTHER_LIBRARIES}
--                      )
--
- install(FILES opencl_clang.h
-         DESTINATION include/cclang
-         COMPONENT ${TARGET_NAME})
+     if(NOT PREFERRED_LLVM_VERSION)
+-        set(PREFERRED_LLVM_VERSION "16.0.0")
++        set(PREFERRED_LLVM_VERSION "17")
+     endif(NOT PREFERRED_LLVM_VERSION)
+     message(STATUS "[OPENCL-CLANG] Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
+     find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)