[gentoo-commits] repo/gentoo:master commit in: eclass/, profiles/desc/

[gentoo-commits] repo/gentoo:master commit in: eclass/, profiles/desc/

[Marek Szuba]

commit:     7ac3151dba659011178da29302c7b7207010454a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 17:12:27 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 12:14:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac3151d

lua-utils.eclass: Support luajit

According to discussions on IRC, luajit should work as a drop-in
replacement for lua5.1 - and indeed, at least for x11-wm/awesome
it has worked.

Note that for the time being dev-lang/luajit uses the same module
directories as dev-lang/lua:5.1, which may lead to weird behaviour in
multi-impl ebuilds supporting both lua5-1 and luajit. Hopefully we will
get luajit to use its own directories so that it is fully independent,
same as we install pypy3 modules in their own directory hierarchy in
spite of compatibility with cpython-3.6.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 eclass/lua-utils.eclass              | 21 +++++++++++++++++----
 profiles/desc/lua_single_target.desc |  1 +
 profiles/desc/lua_targets.desc       |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 490d19a0019..24ef67635d5 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -14,8 +14,6 @@
 # A utility eclass providing functions to query Lua implementations,
 # install Lua modules and scripts.
 #
-# Please note that for the time being this eclass does NOT support luajit.
-#
 # This eclass neither sets any metadata variables nor exports any phase
 # functions. It can be inherited safely.
 
@@ -39,6 +37,7 @@ inherit toolchain-funcs
 # @DESCRIPTION:
 # All supported Lua implementations, most preferred last
 _LUA_ALL_IMPLS=(
+	luajit
 	lua5-1
 	lua5-2
 	lua5-3
@@ -141,9 +140,16 @@ _lua_wrapper_setup() {
 		local ELUA LUA
 		_lua_export "${impl}" ELUA LUA
 
-		# Lua interpreter and compiler
+		# Lua interpreter
 		ln -s "${EPREFIX}"/usr/bin/${ELUA} "${workdir}"/bin/lua || die
-		ln -s "${EPREFIX}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die
+
+		# Lua compiler, or a stub for it in case of luajit
+		if [[ ${ELUA} == luajit ]]; then
+			# Just in case
+			ln -s "${EPREFIX}"/bin/true "${workdir}"/bin/luac || die
+		else
+			ln -s "${EPREFIX}"/usr/bin/${ELUA/a/ac} "${workdir}"/bin/luac || die
+		fi
 
 		# pkg-config
 		ln -s "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${ELUA}.pc \
@@ -201,6 +207,10 @@ _lua_export() {
 	local impl var
 
 	case "${1}" in
+		luajit)
+			impl=${1}
+			shift
+			;;
 		lua*)
 			impl=${1/-/.}
 			shift
@@ -259,6 +269,9 @@ _lua_export() {
 			LUA_PKG_DEP)
 				local d
 				case ${impl} in
+					luajit)
+						LUA_PKG_DEP="dev-lang/luajit:="
+						;;
 					lua*)
 						LUA_PKG_DEP="dev-lang/lua:${impl#lua}"
 						;;

diff --git a/profiles/desc/lua_single_target.desc b/profiles/desc/lua_single_target.desc
index 1bee02b6978..c3d422e434d 100644
--- a/profiles/desc/lua_single_target.desc
+++ b/profiles/desc/lua_single_target.desc
@@ -7,3 +7,4 @@ lua5-1 - Build for Lua 5.1 only
 lua5-2 - Build for Lua 5.2 only
 lua5-3 - Build for Lua 5.3 only
 lua5-4 - Build for Lua 5.4 only
+luajit - Build for LuaJIT only

diff --git a/profiles/desc/lua_targets.desc b/profiles/desc/lua_targets.desc
index 2575de0bcfd..75b9e0f86af 100644
--- a/profiles/desc/lua_targets.desc
+++ b/profiles/desc/lua_targets.desc
@@ -7,3 +7,4 @@ lua5-1 - Build with Lua 5.1
 lua5-2 - Build with Lua 5.2
 lua5-3 - Build with Lua 5.3
 lua5-4 - Build with Lua 5.4
+luajit - Build with LuaJIT

[gentoo-commits] repo/gentoo:master commit in: eclass/, profiles/desc/

[Alfredo Tupone]

commit:     58de4e13ba72c240be6c25238f68af1aebd79107
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 07:37:21 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 07:37:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58de4e13

drop gnat_2019 support

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 eclass/ada.eclass             | 13 +------------
 profiles/desc/ada_target.desc |  1 -
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 6089ed6e737f..fe28142e94ae 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -58,7 +58,7 @@ EXPORT_FUNCTIONS pkg_setup
 # @DESCRIPTION:
 # All supported Ada implementations, most preferred last.
 _ADA_ALL_IMPLS=(
-	gnat_2019 gnat_2020 gnat_2021
+	gnat_2020 gnat_2021
 )
 readonly _ADA_ALL_IMPLS
 
@@ -83,9 +83,6 @@ _ada_impl_supported() {
 	# keep in sync with _ADA_ALL_IMPLS!
 	# (not using that list because inline patterns shall be faster)
 	case "${impl}" in
-		gnat_2019)
-			return 0
-			;;
 		gnat_202[01])
 			return 0
 			;;
@@ -180,10 +177,6 @@ ada_export() {
 	local impl var
 
 	case "${1}" in
-		gnat_201[789])
-			impl=${1}
-			shift
-			;;
 		gnat_202[01])
 			impl=${1}
 			shift
@@ -200,10 +193,6 @@ ada_export() {
 	local gcc_pv
 	local slot
 	case "${impl}" in
-		gnat_2019)
-			gcc_pv=8.3.1
-			slot=8.3.1
-			;;
 		gnat_2020)
 			gcc_pv=9.3.1
 			slot=9.3.1

diff --git a/profiles/desc/ada_target.desc b/profiles/desc/ada_target.desc
index b4a38a397104..eeabf1ffaed1 100644
--- a/profiles/desc/ada_target.desc
+++ b/profiles/desc/ada_target.desc
@@ -1,6 +1,5 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 gnat_2020 - Compile with dev-lang/gnat-gpl-2020
 gnat_2021 - Compile with dev-lang/gnat-gpl-2021

[gentoo-commits] repo/gentoo:master commit in: eclass/, profiles/desc/

[Benda XU]

commit:     7475e8ff0742ead7b45edea3ed7e79c394e23958
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Sun Apr 14 15:43:17 2024 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat May 18 03:46:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7475e8ff

rocm.eclass: Enable ROCm 6, add gfx94{0,1,2} (MI300) support

Update the references, since the original reference does not
contain MI300. The "see also" blog is also removed because it hasn't been
updated for 2 years.

Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 eclass/rocm.eclass                | 12 +++++++++++-
 profiles/desc/amdgpu_targets.desc | 14 ++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/eclass/rocm.eclass b/eclass/rocm.eclass
index e03e8bdd507a..7039455dec6b 100644
--- a/eclass/rocm.eclass
+++ b/eclass/rocm.eclass
@@ -161,7 +161,7 @@ _rocm_set_globals() {
 				gfx906 gfx908 gfx90a gfx1030
 			)
 			;;
-		5.*|9999)
+		5.*)
 			unofficial_amdgpu_targets=(
 				gfx803 gfx900 gfx1010 gfx1011 gfx1012
 				gfx1031 gfx1100 gfx1101 gfx1102
@@ -170,6 +170,16 @@ _rocm_set_globals() {
 				gfx906 gfx908 gfx90a gfx1030
 			)
 			;;
+		6.*|9999)
+			unofficial_amdgpu_targets=(
+				gfx803 gfx900 gfx940 gfx941
+				gfx1010 gfx1011 gfx1012
+				gfx1031 gfx1101 gfx1102
+			)
+			official_amdgpu_targets=(
+				gfx906 gfx908 gfx90a gfx942 gfx1030 gfx1100
+			)
+			;;
 		*)
 			die "Unknown ROCm major version! Please update rocm.eclass before bumping to new ebuilds"
 			;;

diff --git a/profiles/desc/amdgpu_targets.desc b/profiles/desc/amdgpu_targets.desc
index d52080781947..8f337b03f63d 100644
--- a/profiles/desc/amdgpu_targets.desc
+++ b/profiles/desc/amdgpu_targets.desc
@@ -1,15 +1,21 @@
-# Copyright 1999-2023 Gentoo Authors.
+# Copyright 1999-2024 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
-# Reference:
-# GPU name and Architecture codename: https://github.com/GPUOpen-Tools/device_info/blob/master/DeviceInfo.cpp
-# See also: https://www.coelacanth-dream.com/posts/2019/12/30/did-rid-product-matome-p2/#fn:67
+# Reference: GPU name and architecture codename documented by
+# GPUOpen-Tools https://github.com/GPUOpen-Tools/device_info/blob/master/DeviceInfo.cpp
+# ROCm official document (Instinct accelerator only) https://rocm.docs.amd.com/en/latest/reference/gpu-arch/gpu-arch-spec-overview.html
+# Kernel document (note: GC version is not amdgpu gfx target) https://www.kernel.org/doc/html/latest/gpu/amdgpu/driver-misc.html#discrete-gpu-info
+# Kernel source code (map of IP version vs amdgpu gfx target) https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/amdkfd/kfd_device.c kgd2kfd_probe function
+# Mesa drm source code https://gitlab.freedesktop.org/mesa/drm/blob/main/data/amdgpu.ids
 
 gfx803 - Fiji GPU, codename fiji, including Radeon R9 Nano/Fury/FuryX, Radeon Pro Duo, FirePro S9300x2, Radeon Instinct MI8
 gfx900 - Vega GPU, codename vega10, including Radeon Vega Frontier Edition, Radeon RX Vega 56/64, Radeon RX Vega 64 Liquid, Radeon Pro Vega 48/56/64/64X, Radeon Pro WX 8200/9100, Radeon Pro V320/V340/SSG, Radeon Instinct MI25
 gfx906 - Vega GPU, codename vega20, including Radeon (Pro) VII, Radeon Instinct MI50/MI60
 gfx908 - CDNA Accelerator, codename arcturus, including AMD Instinct MI100 Accelerator
 gfx90a - CDNA2 Accelerator, codename aldebaran, including AMD Instinct MI200 series Accelerators
+gfx940 - CDNA3 Accelerator, codename aqua_vangaram, MI300A rev 0
+gfx941 - CDNA3 Accelerator, codename aqua_vangaram, MI300X rev 0
+gfx942 - CDNA3 Accelerator, codename aqua_vangaram, MI300A and MI300X rev >=1
 gfx1010 - RDNA GPU, codename navi10, including Radeon RX 5700XT/5700/5700M/5700B/5700XTB/5600XT/5600/5600M, Radeon Pro 5700XT/5700, Radeon Pro W5700X/W5700
 gfx1011 - RDNA GPU, codename navi12, including Radeon Pro 5600M/V520
 gfx1012 - RDNA GPU, codename navi14, including Radeon RX 5500XT/5500/5500M/5500XTB/5300/5300M, Radeon Pro 5500XT/5500M/5300/5300M, Radeon Pro W5500X/W5500/W5500M/W5300M