@@ -84,6 +84,8 @@ TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "v", "v", "", d)}"
# Now the special Z extensions
# zic64b, zicbop, zicboz, zihintpause, zihpm, za64rs, zfhmin and zkt are
# mandatory in the RVA22U64 and later profiles
+# zicond, zihintntl, zimop, zawrs, zfa, zcb, zcmop, zvbb, zvfhmin, zvkb, zvkt
+# and supm, as well as v, are mandatory in the RVA23U64 and later profiles
TUNEVALID[zic64b] = "Cache blocks are 64 bytes extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zic64b", "_zic64b", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zic64b", "_zic64b", "", d)}"
@@ -121,6 +123,10 @@ TUNEVALID[zicntr] = "Base counters and timers extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zicntr", "_zicntr", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zicntr", "_zicntr", "", d)}"
+TUNEVALID[zicond] = "Integer conditional operations extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zicond", "_zicond", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zicond", "_zicond", "", d)}"
+
TUNEVALID[zicsr] = "Control and status register access extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains_any("TUNE_FEATURES", "zicsr f d", "_zicsr", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains_any("TUNE_FEATURES", "zicsr f d", "_zicsr", "", d)}"
@@ -129,6 +135,10 @@ TUNEVALID[zifencei] = "Instruction-fetch fence extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zifencei", "_zifencei", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zifencei", "_zifencei", "", d)}"
+TUNEVALID[zihintntl] = "Non-temporal locality hints extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zihintntl", "_zihintntl", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zihintntl", "_zihintntl", "", d)}"
+
TUNEVALID[zihintpause] = "Pause hint extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zihintpause", "_zihintpause", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zihintpause", "_zihintpause", "", d)}"
@@ -137,6 +147,10 @@ TUNEVALID[zihpm] = "Hardware performance counters extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zihpm", "_zihpm", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zihpm", "_zihpm", "", d)}"
+TUNEVALID[zimop] = "May-be-operations extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zimop", "_zimop", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zimop", "_zimop", "", d)}"
+
# zmmul, zaamo, zalrsc, zca and zcd are subsets of single-letter extensions
# above (m, a, c and c with d), which compilers enable along with them. They
# are only passed on when listed in TUNE_FEATURES, so that -march doesn't
@@ -164,6 +178,14 @@ TUNEVALID[zalrsc] = "Load-reserved/store-conditional extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zalrsc", "_zalrsc", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zalrsc", bb.utils.contains("TUNE_FEATURES", "a", "", "_zalrsc", d), "", d)}"
+TUNEVALID[zawrs] = "Wait-on-reservation-set instructions extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zawrs", "_zawrs", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zawrs", "_zawrs", "", d)}"
+
+TUNEVALID[zfa] = "Additional floating-point instructions extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zfa", "_zfa", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zfa", "_zfa", "", d)}"
+
TUNEVALID[zfhmin] = "Minimal half-precision floating-point extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zfhmin", "_zfhmin", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zfhmin", "_zfhmin", "", d)}"
@@ -172,10 +194,18 @@ TUNEVALID[zca] = "Compressed integer instructions extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zca", "_zca", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zca", bb.utils.contains("TUNE_FEATURES", "c", "", "_zca", d), "", d)}"
+TUNEVALID[zcb] = "Additional compressed instructions extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zcb", "_zcb", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zcb", "_zcb", "", d)}"
+
TUNEVALID[zcd] = "Compressed double-precision floating-point instructions extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zcd", "_zcd", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zcd", bb.utils.contains("TUNE_FEATURES", "c d", "", "_zcd", d), "", d)}"
+TUNEVALID[zcmop] = "Compressed may-be-operations extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zcmop", "_zcmop", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zcmop", "_zcmop", "", d)}"
+
TUNEVALID[zba] = "Address bit manipulation extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains_any("TUNE_FEATURES", "b zba", "_zba", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains_any("TUNE_FEATURES", "b zba", "_zba", "", d)}"
@@ -196,6 +226,65 @@ TUNEVALID[zkt] = "Data-independent execution latency extension"
TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zkt", "_zkt", "", d)}"
TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zkt", "_zkt", "", d)}"
+TUNEVALID[zvbb] = "Vector basic bit-manipulation extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvbb", "_zvbb", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvbb", "_zvbb", "", d)}"
+
+# The zve* and zvl* extensions are subsets of v, like zmmul is of m above, so
+# they are only added to the package arch when v isn't enabled. Other extensions
+# also imply them (e.g. zvbb implies zvkb, zve32x, and zvl32b), which the
+# compilers handle but the package arch doesn't. Tunes using them without v
+# should set RISCVPKGARCH:tune-<name>.
+TUNEVALID[zve32f] = "Embedded vector (32-bit integer and floating-point) extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve32f", "_zve32f", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve32f", bb.utils.contains("TUNE_FEATURES", "v", "", "_zve32f", d), "", d)}"
+
+TUNEVALID[zve32x] = "Embedded vector (32-bit integer) extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve32x", "_zve32x", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve32x", bb.utils.contains("TUNE_FEATURES", "v", "", "_zve32x", d), "", d)}"
+
+TUNEVALID[zve64d] = "Embedded vector (64-bit integer, 64-bit floating-point) extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve64d", "_zve64d", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve64d", bb.utils.contains("TUNE_FEATURES", "v", "", "_zve64d", d), "", d)}"
+
+TUNEVALID[zve64f] = "Embedded vector (64-bit integer, 32-bit floating-point) extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve64f", "_zve64f", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve64f", bb.utils.contains("TUNE_FEATURES", "v", "", "_zve64f", d), "", d)}"
+
+TUNEVALID[zve64x] = "Embedded vector (64-bit integer) extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve64x", "_zve64x", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zve64x", bb.utils.contains("TUNE_FEATURES", "v", "", "_zve64x", d), "", d)}"
+
+TUNEVALID[zvfhmin] = "Vector minimal half-precision floating-point extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvfhmin", "_zvfhmin", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvfhmin", "_zvfhmin", "", d)}"
+
+# zvkb is a subset of zvbb
+TUNEVALID[zvkb] = "Vector cryptography bit-manipulation extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvkb", "_zvkb", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvkb", bb.utils.contains("TUNE_FEATURES", "zvbb", "", "_zvkb", d), "", d)}"
+
+TUNEVALID[zvkt] = "Vector data-independent execution latency extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvkt", "_zvkt", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvkt", "_zvkt", "", d)}"
+
+TUNEVALID[zvl128b] = "Minimum vector length of 128 bits extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvl128b", "_zvl128b", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvl128b", bb.utils.contains("TUNE_FEATURES", "v", "", "_zvl128b", d), "", d)}"
+
+TUNEVALID[zvl32b] = "Minimum vector length of 32 bits extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvl32b", "_zvl32b", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvl32b", bb.utils.contains("TUNE_FEATURES", "v", "", "_zvl32b", d), "", d)}"
+
+TUNEVALID[zvl64b] = "Minimum vector length of 64 bits extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvl64b", "_zvl64b", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "zvl64b", bb.utils.contains("TUNE_FEATURES", "v", "", "_zvl64b", d), "", d)}"
+
+# Supervisor-level extensions, which come after all of the Z extensions
+TUNEVALID[supm] = "User-mode pointer masking extension"
+TUNE_RISCV_MARCH .= "${@bb.utils.contains("TUNE_FEATURES", "supm", "_supm", "", d)}"
+TUNE_RISCV_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "supm", "_supm", "", d)}"
+
# Construct TUNE_CCARGS
# This should result in a CCARG similar to:
# -march=rv32imac -mabi=ilp32
@@ -2,7 +2,7 @@ require conf/machine/include/riscv/arch-riscv.inc
DEFAULTTUNE ?= "riscv64gc"
-AVAILTUNES += "riscv64gcv riscv64gc riscv32gc riscv64 riscv32 riscv64nc riscv64nf riscv32nf rva20u64 rva22u64"
+AVAILTUNES += "riscv64gcv riscv64gc riscv32gc riscv64 riscv32 riscv64nc riscv64nf riscv32nf rva20u64 rva22u64 rva23u64"
# Default
TUNE_FEATURES:tune-riscv64gc := "${@oe.tune.riscv_isa_to_tune("rv64gc")}"
@@ -48,3 +48,7 @@ PACKAGE_EXTRA_ARCHS:tune-rva20u64 = "${RISCVPKGARCH:tune-rva20u64}"
TUNE_FEATURES:tune-rva22u64 := "${@oe.tune.riscv_isa_to_tune("rva22u64")} zifencei"
RISCVPKGARCH:tune-rva22u64 ?= "rva22u64_zifencei"
PACKAGE_EXTRA_ARCHS:tune-rva22u64 = "${RISCVPKGARCH:tune-rva22u64}"
+
+TUNE_FEATURES:tune-rva23u64 := "${@oe.tune.riscv_isa_to_tune("rva23u64")} zifencei"
+RISCVPKGARCH:tune-rva23u64 ?= "rva23u64_zifencei"
+PACKAGE_EXTRA_ARCHS:tune-rva23u64 = "${RISCVPKGARCH:tune-rva23u64}"
Add TUNE_FEATURES for the extensions mandated by the RVA23U64 profile, which weren't yet in arch-riscv.inc: - zicond - zihintntl - zimop - zawrs - zfa - zcb - zcmop - zvbb - zvfhmin - zvkb - zvkt - supm - zve* and zvl* vector extensions The zve*/zvl* extensions are only added to the package arch when v isn't enabled, and zvkb, when zvbb isn't. As with other profiles, zifencei is added to the extension set since it's required by Linux, making the package arch 'rva23u64_zifencei'. Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> --- .../conf/machine/include/riscv/arch-riscv.inc | 89 +++++++++++++++++++ .../conf/machine/include/riscv/tune-riscv.inc | 6 +- 2 files changed, 94 insertions(+), 1 deletion(-)