From f16f3e3a18a6be1d27651ff3737a2c42a5b90b22 Mon Sep 17 00:00:00 2001 From: Patrick Diehl Date: Wed, 13 Nov 2024 09:15:01 -0700 Subject: [PATCH 1/7] Add RISC-V architectures --- docs/source/keywords.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst index d8f71eaa4..53772d211 100644 --- a/docs/source/keywords.rst +++ b/docs/source/keywords.rst @@ -431,7 +431,12 @@ CPU architectures * * ``Kokkos_ARCH_ZEN3`` * Optimize for Zen3 architecture * ``OFF`` - + * * ``KOKKOS_ARCH_RISCV_RVA22V`` + * Optimize for RISC-V_RVA22V architecture + * ``OFF`` + * * ``KOKKOS_ARCH_RISCV_SG2042`` + * Optimize for RISC-V_SG2042 architecture + * ``OFF`` GPU Architectures ----------------- From d454bcc62b208dc399a053aa06a219097f9df20d Mon Sep 17 00:00:00 2001 From: Patrick Diehl Date: Mon, 2 Dec 2024 13:11:13 -0700 Subject: [PATCH 2/7] Update keywords.rst --- docs/source/keywords.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst index 2fa8404cc..e45ba04bd 100644 --- a/docs/source/keywords.rst +++ b/docs/source/keywords.rst @@ -502,15 +502,18 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p * - CMake keyword - Architecture/Instruction set - - Examples + - Examples + - Notes * - ``KOKKOS_ARCH_RISCV_RVA22V`` - RVA22V/RISC-V ISA - + - (since Kokkos 4.5.0) * - ``KOKKOS_ARCH_RISCV_SG2042`` - SG2042/RISC-V ISA - - + - + - (since Kokkos 4.3.0) GPU Architectures ----------------- From e747a4eb0a74b9998f5f6086a69dfa5a8695dbff Mon Sep 17 00:00:00 2001 From: Patrick Diehl Date: Mon, 2 Dec 2024 13:16:58 -0700 Subject: [PATCH 3/7] Update keywords.rst --- docs/source/keywords.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst index e45ba04bd..e88201d7a 100644 --- a/docs/source/keywords.rst +++ b/docs/source/keywords.rst @@ -487,6 +487,7 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p * - ``Kokkos_ARCH_KNL`` - Knights Landing/x86-64 - 31S1P @ Tianhe-2 + * - ``Kokkos_ARCH_KNC`` - Knights Corner/x86-64 - From ff53d77067cab8426be2f92593ff912cb15c0a50 Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Mon, 2 Dec 2024 15:22:56 -0500 Subject: [PATCH 4/7] Apply suggestions from code review --- docs/source/keywords.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst index e88201d7a..5ec335c94 100644 --- a/docs/source/keywords.rst +++ b/docs/source/keywords.rst @@ -497,7 +497,7 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p - .. list-table:: RISC-V CPU architectures - :widths: 30 30 30 + :widths: 30 30 30 30 :header-rows: 1 :align: left @@ -508,13 +508,13 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p * - ``KOKKOS_ARCH_RISCV_RVA22V`` - RVA22V/RISC-V ISA - - - - (since Kokkos 4.5.0) + - SpacemiT K1 + - (since Kokkos 4.5) * - ``KOKKOS_ARCH_RISCV_SG2042`` - SG2042/RISC-V ISA - - - - (since Kokkos 4.3.0) + - Milk-V Pioneer + - (since Kokkos 4.3) GPU Architectures ----------------- From 663f494d793209bc01f46f826747f41965826fac Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Mon, 2 Dec 2024 15:23:53 -0500 Subject: [PATCH 5/7] Apply suggestions from code review --- docs/source/keywords.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst index 5ec335c94..e7fc307ef 100644 --- a/docs/source/keywords.rst +++ b/docs/source/keywords.rst @@ -507,7 +507,7 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p - Notes * - ``KOKKOS_ARCH_RISCV_RVA22V`` - - RVA22V/RISC-V ISA + - RVA22V/RISC-V ISA - SpacemiT K1 - (since Kokkos 4.5) From 6496be5174e3479d7e10b391e552003e4f41025a Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Mon, 2 Dec 2024 15:24:41 -0500 Subject: [PATCH 6/7] Apply suggestions from code review --- docs/source/keywords.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst index e7fc307ef..05ee35058 100644 --- a/docs/source/keywords.rst +++ b/docs/source/keywords.rst @@ -506,12 +506,12 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p - Examples - Notes - * - ``KOKKOS_ARCH_RISCV_RVA22V`` + * - ``Kokkos_ARCH_RISCV_RVA22V`` - RVA22V/RISC-V ISA - SpacemiT K1 - (since Kokkos 4.5) - * - ``KOKKOS_ARCH_RISCV_SG2042`` + * - ``Kokkos_ARCH_RISCV_SG2042`` - SG2042/RISC-V ISA - Milk-V Pioneer - (since Kokkos 4.3) From 76abc9042f550003078f9c3d6e63699f2e26b8e7 Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Mon, 2 Dec 2024 15:25:01 -0500 Subject: [PATCH 7/7] Cleanup --- docs/source/keywords.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst index 05ee35058..2cfda72e2 100644 --- a/docs/source/keywords.rst +++ b/docs/source/keywords.rst @@ -512,8 +512,8 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p - (since Kokkos 4.5) * - ``Kokkos_ARCH_RISCV_SG2042`` - - SG2042/RISC-V ISA - - Milk-V Pioneer + - SG2042/RISC-V ISA + - Milk-V Pioneer - (since Kokkos 4.3) GPU Architectures