From nobody Fri Apr 11 18:36:22 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZZ54908vcz5sT9j; Fri, 11 Apr 2025 18:36:25 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZ5486Dtqz3YPK; Fri, 11 Apr 2025 18:36:24 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744396584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mlvV9St+9MWD/WIx47LEEspKe7Fep4C2uhRu/jRtE14=; b=ov09d5kWQXJO+B3q6M4h0EIKIk3L3/1c4PwVn9BB8a2gP6iZWdFx8X/ZC+A1+lRsfIQuzw UhHCRyrLJtGQ5GDFTtZBNtCpd7fdUmcbLd+Y4OCXZZEIHn5joQGxk5C+M9o9kDTLb7HngK awb4sq+FASWrcs+1nCukIvWhoWgvoCCZOlweQnyENmBzjP+7JovKByKFFPnJTLyHBn0rQi TsTN2y/dPGI8GDGgDMiQjOUdPI8DkaDt8fkb9RJO4WrHGT3hRZcUBsHxYkAwI7nhomb8YX VzP/rXjLS9wZTnwBTMnEStVirLehDYWZ0irma+USVjHhfXwEHbAzTdFs1zfiGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744396584; a=rsa-sha256; cv=none; b=pOuerMWLeT1q67eOs16cwsTFGQzK0J2O9SyF5N363PNmSc5+YwbjekquKyUj6gfPlEvssQ losWfatTBJK1dV71m6OGpjOD5xWiT9ytgblsjGgjrSCHK5hwnBFZUcZ9Go9SSY0tHc4nic kdwz90O+OAKWDXRTJCNDYvC0XqxhbohjInxG/Q3j1rwxmGVTwealuvLjAtia2ESYBQkRc4 7BKZfyVFnfAyqedtDGnGKWpIoPEIShGsd7Cmla35I/0/ZBf6wOjs6E5skNy8/gRmf3o/Z1 N8LUtKe9/rCruT1mXVgeUt1Xn0ZaJ8qCrqkwtjm0wDxCeiGBLXMoDAl7DRmheQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744396584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mlvV9St+9MWD/WIx47LEEspKe7Fep4C2uhRu/jRtE14=; b=qbNGzFkpwIgTY/7Zb9H31pYiXs6/+6IjEfch6wXOX024lumRXc4npY9/Qnjj86FoG2/qGq Ue1BHVZl/Eih2456B/1FnhJMSlEsCF1JRFpOkeK0rvhX4/qU1StrPJuGpZbXJryZDlgl4i 9rgnIbmkr7GB4eclUGZxBLBdKrnhXvlq+0DHSvp8/US0jbd3muBeAqv1Hpywl3tRGYvBR1 HoDARafUVnYQhh6LnGybnlQ924fYo2oG0/ph/wlRiv2oCwi0iHuaCdt0RFpsQmf+Z6Pted 6aF6IW8dqSArNPCdPk23nEKJU2VzI7P9Cp98S8pqeogazbeAKZGRA0seu/BA1w== Received: from [192.168.1.16] (217-209-194-237-no600.tbcn.telia.com [217.209.194.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: diizzy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZZ5481qJqzNYb; Fri, 11 Apr 2025 18:36:24 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Content-Type: multipart/alternative; boundary="------------Wkp0ordFfIQ4Edni7FmQQXkK" Message-ID: <9d3a48e4-d720-4454-b6a4-b3fe606d2ec0@FreeBSD.org> Date: Fri, 11 Apr 2025 20:36:22 +0200 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Betterbird (Windows) Subject: Re: git: 892ce9827770 - main - misc/llama-cpp: Fix run-time on older CPUs To: Yuri Victorovich , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202504110126.53B1QeYI032258@gitrepo.freebsd.org> Content-Language: en-US From: Daniel Engberg In-Reply-To: <202504110126.53B1QeYI032258@gitrepo.freebsd.org> This is a multi-part message in MIME format. --------------Wkp0ordFfIQ4Edni7FmQQXkK Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2025-04-11 03:26, Yuri Victorovich wrote: > The branch main has been updated by yuri: > > URL:https://cgit.FreeBSD.org/ports/commit/?id=892ce9827770be54592389891c5fe6d005b19b2e > > commit 892ce9827770be54592389891c5fe6d005b19b2e > Author: Yuri Victorovich > AuthorDate: 2025-04-11 01:09:26 +0000 > Commit: Yuri Victorovich > CommitDate: 2025-04-11 01:26:36 +0000 > > misc/llama-cpp: Fix run-time on older CPUs > > ... by disabling explicit flags that enable them. > --- > misc/llama-cpp/Makefile | 3 ++- > misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt | 11 +++++++++++ > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile > index f59d16d148d3..3230207092e5 100644 > --- a/misc/llama-cpp/Makefile > +++ b/misc/llama-cpp/Makefile > @@ -1,7 +1,7 @@ > PORTNAME= llama-cpp > DISTVERSIONPREFIX= b > DISTVERSION= 5097 > -PORTREVISION= 1 > +PORTREVISION= 2 > CATEGORIES= misc # machine-learning > > MAINTAINER= yuri@FreeBSD.org > @@ -26,6 +26,7 @@ SHEBANG_GLOB= *.py > > CMAKE_ON= BUILD_SHARED_LIBS > CMAKE_OFF= GGML_NATIVE \ > + FREEBSD_ALLOW_ADVANCED_CPU_FEATURES \ > LLAMA_BUILD_TESTS > CMAKE_TESTING_ON= LLAMA_BUILD_TESTS > > diff --git a/misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt b/misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt > new file mode 100644 > index 000000000000..5e6ff248184a > --- /dev/null > +++ b/misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt > @@ -0,0 +1,11 @@ > +--- ggml/src/ggml-cpu/CMakeLists.txt.orig 2025-04-10 23:26:06 UTC > ++++ ggml/src/ggml-cpu/CMakeLists.txt > +@@ -236,7 +236,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name) > + else () > + if (GGML_NATIVE) > + list(APPEND ARCH_FLAGS -march=native) > +- else () > ++ elseif (FREEBSD_ALLOW_ADVANCED_CPU_FEATURES) > + list(APPEND ARCH_FLAGS -msse4.2) > + list(APPEND ARCH_DEFINITIONS GGML_SSE42) > + if (GGML_F16C) Hi, It's not possible to solely rely on CPUTYPE? Best regards Daniel --------------Wkp0ordFfIQ4Edni7FmQQXkK Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit
On 2025-04-11 03:26, Yuri Victorovich wrote:
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=892ce9827770be54592389891c5fe6d005b19b2e

commit 892ce9827770be54592389891c5fe6d005b19b2e
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-04-11 01:09:26 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-04-11 01:26:36 +0000

    misc/llama-cpp: Fix run-time on older CPUs
    
    ... by disabling explicit flags that enable them.
---
 misc/llama-cpp/Makefile                                     |  3 ++-
 misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile
index f59d16d148d3..3230207092e5 100644
--- a/misc/llama-cpp/Makefile
+++ b/misc/llama-cpp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	llama-cpp
 DISTVERSIONPREFIX=	b
 DISTVERSION=	5097
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -26,6 +26,7 @@ SHEBANG_GLOB=	*.py
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	GGML_NATIVE \
+		FREEBSD_ALLOW_ADVANCED_CPU_FEATURES \
 		LLAMA_BUILD_TESTS
 CMAKE_TESTING_ON=	LLAMA_BUILD_TESTS
 
diff --git a/misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt b/misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt
new file mode 100644
index 000000000000..5e6ff248184a
--- /dev/null
+++ b/misc/llama-cpp/files/patch-ggml_src_ggml-cpu_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ggml/src/ggml-cpu/CMakeLists.txt.orig	2025-04-10 23:26:06 UTC
++++ ggml/src/ggml-cpu/CMakeLists.txt
+@@ -236,7 +236,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
+         else ()
+             if (GGML_NATIVE)
+                 list(APPEND ARCH_FLAGS -march=native)
+-            else ()
++            elseif (FREEBSD_ALLOW_ADVANCED_CPU_FEATURES)
+                 list(APPEND ARCH_FLAGS -msse4.2)
+                 list(APPEND ARCH_DEFINITIONS GGML_SSE42)
+                 if (GGML_F16C)

Hi,

It's not possible to solely rely on CPUTYPE?

Best regards

Daniel

--------------Wkp0ordFfIQ4Edni7FmQQXkK--