CVS commit: pkgsrc/sysutils/cpuinfo

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/cpuinfo
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 5 Aug 2025 14:16:59 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug  5 14:16:59 UTC 2025

Modified Files:
        pkgsrc/sysutils/cpuinfo: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/cpuinfo/patches: patch-CMakeLists.txt
            patch-src_freebsd_topology.c patch-src_init.c

Log Message:
cpuinfo: update to 0.0.20250724.

pkgsrc: Add basic NetBSD support.
upstream: some more CPUs supported.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/cpuinfo/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/cpuinfo/PLIST \
    pkgsrc/sysutils/cpuinfo/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/cpuinfo/patches/patch-CMakeLists.txt \
    pkgsrc/sysutils/cpuinfo/patches/patch-src_freebsd_topology.c \
    pkgsrc/sysutils/cpuinfo/patches/patch-src_init.c

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

Modified files:

Index: pkgsrc/sysutils/cpuinfo/Makefile
diff -u pkgsrc/sysutils/cpuinfo/Makefile:1.2 pkgsrc/sysutils/cpuinfo/Makefile:1.3
--- pkgsrc/sysutils/cpuinfo/Makefile:1.2        Sun May 11 08:25:29 2025
+++ pkgsrc/sysutils/cpuinfo/Makefile    Tue Aug  5 14:16:59 2025
@@ -1,21 +1,50 @@
-# $NetBSD: Makefile,v 1.2 2025/05/11 08:25:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/08/05 14:16:59 wiz Exp $
 
-DISTNAME=      cpuinfo-0.0.20250219
+DISTNAME=      cpuinfo-0.0.20250724
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=pytorch/}
-GITHUB_TAG=    b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea
+GITHUB_TAG=    33ed0be77d7767d0e2010e2c3cf972ef36c7c307
+DISTFILES=     ${DEFAULT_DISTFILES}
+DISTFILES+=    benchmark-1.6.1.tar.gz
+SITES.benchmark-1.6.1.tar.gz= \
+       -${MASTER_SITE_GITHUB:=google/}benchmark/archive/v1.6.1.tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/pytorch/cpuinfo/
 COMMENT=       CPU information library
 LICENSE=       2-clause-bsd
 
-USE_LANGUAGES+=                c
+USE_LANGUAGES+=                c c++
+USE_CXX_FEATURES+=     c++17
+FORCE_CXX_STD=         c++17
+USE_TOOLS+=            pkg-config
 
 PKGCONFIG_OVERRIDE=    libcpuinfo.pc.in
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_GOOGLETEST=ON
+#CMAKE_CONFIGURE_ARGS+=        -DUSE_SYSTEM_LIBS=ON
+CMAKE_CONFIGURE_ARGS+= -DGOOGLEBENCHMARK_SOURCE_DIR=deps/googlebenchmark
+
+post-extract:
+       ${MV} ${WRKDIR}/benchmark-1.6.1 ${WRKSRC}/deps/googlebenchmark
+
+post-install:
+.for file in \
+       include/benchmark/benchmark.h \
+       lib/cmake/benchmark/benchmarkConfig.cmake \
+       lib/cmake/benchmark/benchmarkConfigVersion.cmake \
+       lib/cmake/benchmark/benchmarkTargets-noconfig.cmake \
+       lib/cmake/benchmark/benchmarkTargets.cmake \
+       lib/libbenchmark.a \
+       lib/libbenchmark_main.a \
+       lib/pkgconfig/benchmark.pc
+       ${RM} ${DESTDIR}${PREFIX}/${file}
+.endfor
 
-# not supported by upstream, work started in wip/cpuinfo
-BROKEN_ON_PLATFORM+=   NetBSD-*-*
 
 .include "../../devel/cmake/build.mk"
+# Can't use
+#.include "../../benchmarks/google-benchmark/buildlink3.mk"
+# because of
+# https://github.com/pytorch/cpuinfo/issues/313
+.include "../../devel/googletest/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/cpuinfo/PLIST
diff -u pkgsrc/sysutils/cpuinfo/PLIST:1.1 pkgsrc/sysutils/cpuinfo/PLIST:1.2
--- pkgsrc/sysutils/cpuinfo/PLIST:1.1   Sun Feb 23 21:54:05 2025
+++ pkgsrc/sysutils/cpuinfo/PLIST       Tue Aug  5 14:16:59 2025
@@ -1,7 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2025/02/23 21:54:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/08/05 14:16:59 wiz Exp $
+bin/cache-info
+bin/cpu-info
+bin/cpuid-dump
+bin/isa-info
 include/cpuinfo.h
 lib/libcpuinfo.a
 lib/pkgconfig/libcpuinfo.pc
 share/cpuinfo/cpuinfo-config.cmake
 share/cpuinfo/cpuinfo-targets-noconfig.cmake
 share/cpuinfo/cpuinfo-targets.cmake
+share/doc/cpuinfo/AssemblyTests.md
+share/doc/cpuinfo/_config.yml
+share/doc/cpuinfo/dependencies.md
+share/doc/cpuinfo/index.md
+share/doc/cpuinfo/perf_counters.md
+share/doc/cpuinfo/platform_specific_build_instructions.md
+share/doc/cpuinfo/random_interleaving.md
+share/doc/cpuinfo/releasing.md
+share/doc/cpuinfo/tools.md
+share/doc/cpuinfo/user_guide.md
Index: pkgsrc/sysutils/cpuinfo/distinfo
diff -u pkgsrc/sysutils/cpuinfo/distinfo:1.1 pkgsrc/sysutils/cpuinfo/distinfo:1.2
--- pkgsrc/sysutils/cpuinfo/distinfo:1.1        Sun Feb 23 21:54:05 2025
+++ pkgsrc/sysutils/cpuinfo/distinfo    Tue Aug  5 14:16:59 2025
@@ -1,5 +1,14 @@
-$NetBSD: distinfo,v 1.1 2025/02/23 21:54:05 wiz Exp $
+$NetBSD: distinfo,v 1.2 2025/08/05 14:16:59 wiz Exp $
 
-BLAKE2s (cpuinfo-0.0.20250219-b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea.tar.gz) = 7c223c899d6083b17b8421b46ec260f59fcb2f6f2d7cf9acdb574998b1b25967
-SHA512 (cpuinfo-0.0.20250219-b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea.tar.gz) = 
068fb7ff96a27aff1321026d8598b7352dee136d6bd1a088f119de4f8671efebb3b2e0a8a0bc2460088f1307d355c39e4db36e6b9cf3fb5c2a1130a5733be437
-Size (cpuinfo-0.0.20250219-b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea.tar.gz) = 3545694 bytes
+BLAKE2s (benchmark-1.6.1.tar.gz) = e1d824a20befda52931de3256cbf065724b076fdf4d6feb8b101e56d283f8418
+SHA512 (benchmark-1.6.1.tar.gz) = 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
+Size (benchmark-1.6.1.tar.gz) = 184616 bytes
+BLAKE2s (cpuinfo-0.0.20250724-33ed0be77d7767d0e2010e2c3cf972ef36c7c307.tar.gz) = 501c3de724c1420111f2784fb470e6371239286fddb2f4962bacf7c5619b7d84
+SHA512 (cpuinfo-0.0.20250724-33ed0be77d7767d0e2010e2c3cf972ef36c7c307.tar.gz) = 
41775802b5a33f1bb0cb2c5dd126180e25d281a57c934d94247130c31ec7bf1dbf269ed9e8e946be1bdeeb09f0c17fee42048f71b4beb44c65df18cfb0cddc3b
+Size (cpuinfo-0.0.20250724-33ed0be77d7767d0e2010e2c3cf972ef36c7c307.tar.gz) = 3546678 bytes
+BLAKE2s (googletest-1.11.0.tar.gz) = 0b546cc02c7a8d6e15337b5dde02e2ff1c17bb5232212cba0b665ad47ff51eac
+SHA512 (googletest-1.11.0.tar.gz) = 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
+Size (googletest-1.11.0.tar.gz) = 886330 bytes
+SHA1 (patch-CMakeLists.txt) = ec8a0d584d00540102d50b436f251fbf6521259e
+SHA1 (patch-src_freebsd_topology.c) = 4561cabdbad0765d63c6822d9ee3dfd5235592f2
+SHA1 (patch-src_init.c) = 8a516a15d55b7fb1c9cf505d4dcaf5320775fb4a

Added files:

Index: pkgsrc/sysutils/cpuinfo/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/sysutils/cpuinfo/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue Aug  5 14:16:59 2025
+++ pkgsrc/sysutils/cpuinfo/patches/patch-CMakeLists.txt        Tue Aug  5 14:16:59 2025
@@ -0,0 +1,57 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/08/05 14:16:59 wiz Exp $
+
+Add basic NetBSD support.
+https://github.com/pytorch/cpuinfo/pull/315
+
+--- CMakeLists.txt.orig        2025-07-24 17:36:24.000000000 +0000
++++ CMakeLists.txt
+@@ -67,7 +67,7 @@ ENDIF()
+ 
+ # -- [ Determine target processor
+ SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+-IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND CPUINFO_TARGET_PROCESSOR STREQUAL "amd64")
++IF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)" AND CPUINFO_TARGET_PROCESSOR STREQUAL "amd64")
+   SET(CPUINFO_TARGET_PROCESSOR "AMD64")
+ ENDIF()
+ IF(IS_APPLE_OS AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64.*)$")
+@@ -108,7 +108,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
+       "Target operating system is not specified. "
+       "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
+   SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
+-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD|Emscripten)$")
++ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD|NetBSD|Emscripten)$")
+   IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT IS_APPLE_OS)
+     MESSAGE(WARNING
+       "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. "
+@@ -181,7 +181,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
+       LIST(APPEND CPUINFO_SRCS src/x86/mach/init.c)
+     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$")
+       LIST(APPEND CPUINFO_SRCS src/x86/windows/init.c)
+-    ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
+       LIST(APPEND CPUINFO_SRCS src/x86/freebsd/init.c)
+     ENDIF()
+   ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^Windows" AND CPUINFO_TARGET_PROCESSOR MATCHES "^(ARM64|arm64)$")
+@@ -240,11 +240,11 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
+       src/linux/processors.c)
+   ELSEIF(IS_APPLE_OS)
+     LIST(APPEND CPUINFO_SRCS src/mach/topology.c)
+-  ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  ELSEIF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
+     LIST(APPEND CPUINFO_SRCS src/freebsd/topology.c)
+   ENDIF()
+ 
+-  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
+     SET(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+     SET(THREADS_PREFER_PTHREAD_FLAG TRUE)
+     FIND_PACKAGE(Threads REQUIRED)
+@@ -309,7 +309,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
+     TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
+     TARGET_COMPILE_DEFINITIONS(cpuinfo PRIVATE _GNU_SOURCE=1)
+     TARGET_COMPILE_DEFINITIONS(cpuinfo_internals PRIVATE _GNU_SOURCE=1)
+-  ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  ELSEIF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
+     TARGET_LINK_LIBRARIES(cpuinfo PUBLIC ${CMAKE_THREAD_LIBS_INIT})
+     TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
+   ENDIF()
Index: pkgsrc/sysutils/cpuinfo/patches/patch-src_freebsd_topology.c
diff -u /dev/null pkgsrc/sysutils/cpuinfo/patches/patch-src_freebsd_topology.c:1.1
--- /dev/null   Tue Aug  5 14:16:59 2025
+++ pkgsrc/sysutils/cpuinfo/patches/patch-src_freebsd_topology.c        Tue Aug  5 14:16:59 2025
@@ -0,0 +1,51 @@
+$NetBSD: patch-src_freebsd_topology.c,v 1.1 2025/08/05 14:16:59 wiz Exp $
+
+Add basic NetBSD support.
+https://github.com/pytorch/cpuinfo/pull/315
+
+--- src/freebsd/topology.c.orig        2025-07-24 17:36:24.000000000 +0000
++++ src/freebsd/topology.c
+@@ -20,6 +20,7 @@ static int sysctl_int(const char* name) 
+       return value;
+ }
+ 
++#if defined(__FreeBSD__)
+ static char* sysctl_str(const char* name) {
+       size_t value_size = 0;
+       if (sysctlbyname(name, NULL, &value_size, NULL, 0) != 0) {
+@@ -42,6 +43,7 @@ static char* sysctl_str(const char* name
+       }
+       return value;
+ }
++#endif
+ 
+ struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void) {
+       struct cpuinfo_freebsd_topology topology = {
+@@ -50,6 +52,7 @@ struct cpuinfo_freebsd_topology cpuinfo_
+               .threads_per_core = 0,
+               .threads = 0,
+       };
++#if defined (__FreeBSD__)
+       char* topology_spec = sysctl_str("kern.sched.topology_spec");
+       if (!topology_spec) {
+               return topology;
+@@ -94,6 +97,19 @@ struct cpuinfo_freebsd_topology cpuinfo_
+               topology.threads_per_core);
+       topology.threads = topology.threads_per_core * topology.cores;
+       return topology;
++#elif defined(__NetBSD__)
++      topology.cores = sysctl_int("hw.ncpu");
++      if (topology.cores == 0) {
++              goto fail;
++      }
++      cpuinfo_log_debug("netbsd topology: cores = %d", topology.cores);
++      /* more details need active identification of the CPU, no sysctl available */
++      /* TODO: improve */
++      topology.threads = topology.cores;
++      topology.packages = 1;
++      topology.threads_per_core = 1;
++      return topology;
++#endif
+ fail:
+       topology.packages = 0;
+       return topology;
Index: pkgsrc/sysutils/cpuinfo/patches/patch-src_init.c
diff -u /dev/null pkgsrc/sysutils/cpuinfo/patches/patch-src_init.c:1.1
--- /dev/null   Tue Aug  5 14:16:59 2025
+++ pkgsrc/sysutils/cpuinfo/patches/patch-src_init.c    Tue Aug  5 14:16:59 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_init.c,v 1.1 2025/08/05 14:16:59 wiz Exp $
+
+Add basic NetBSD support.
+https://github.com/pytorch/cpuinfo/pull/315
+
+--- src/init.c.orig    2025-07-24 17:36:24.000000000 +0000
++++ src/init.c
+@@ -24,7 +24,7 @@ bool CPUINFO_ABI cpuinfo_initialize(void
+ #if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64
+ #if defined(__MACH__) && defined(__APPLE__)
+       pthread_once(&init_guard, &cpuinfo_x86_mach_init);
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+       pthread_once(&init_guard, &cpuinfo_x86_freebsd_init);
+ #elif defined(__linux__)
+       pthread_once(&init_guard, &cpuinfo_x86_linux_init);

Prev by Date: CVS commit: pkgsrc/lang/zig
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/zig
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index