From ed7ee120a1954ecc4c59375f0783f1dfe9a5542c Mon Sep 17 00:00:00 2001
From: Damien L-G <dalg24@gmail.com>
Date: Tue, 26 Nov 2024 12:02:58 -0500
Subject: [PATCH 1/2] Document ZEN4 cpu arch

---
 docs/source/keywords.rst | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst
index 8a2f93a1a..82659c0d9 100644
--- a/docs/source/keywords.rst
+++ b/docs/source/keywords.rst
@@ -365,29 +365,39 @@ When compiling on the machine that the code also runs on, the easiest way to get
 If cross-compiling, or if you want to be specific, the CPU architecture can be passed to Kokkos manually. For the available architectures see the following list.
 
 .. list-table:: AMD CPU architectures
-    :widths: 30 30 30
+    :widths: 30 30 30 30
     :header-rows: 1
     :align: left
 
     * - CMake keyword
       - Architecture/Instruction set
       - Examples
+      - Notes
+
+    * - ``Kokkos_ARCH_ZEN4``
+      - Zen 4/amd64
+      - Epyc Genoa @ LLNL El Capitan
+      - (since Kokkos 4.6)
 
     * - ``Kokkos_ARCH_ZEN3``
       - Zen 3/amd64
       - Epyc 7713 @ ORNL Frontier
+      -
 
     * - ``Kokkos_ARCH_ZEN2``
       - Zen 2/amd64
       - Epyc 7742 @ NOAA
+      -
 
     * - ``Kokkos_ARCH_ZEN``
       - Zen/amd64
       - Epyc @ ANL Selene
+      -
 
     * - ``Kokkos_ARCH_AMDAVX``
       - Bullozer/amd64
       -
+      -
 
 .. list-table:: ARM CPU architectures
     :widths: 30 30 30

From 617a0838465f07d373d5d2d358767722b1d56579 Mon Sep 17 00:00:00 2001
From: Damien L-G <dalg24@gmail.com>
Date: Tue, 26 Nov 2024 17:51:21 -0500
Subject: [PATCH 2/2] Add a note clarifying when support for NVIDIA Grace Arm
 CPU was added

---
 docs/source/keywords.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/source/keywords.rst b/docs/source/keywords.rst
index 82659c0d9..a87b7635c 100644
--- a/docs/source/keywords.rst
+++ b/docs/source/keywords.rst
@@ -400,38 +400,45 @@ If cross-compiling, or if you want to be specific, the CPU architecture can be p
       -
 
 .. list-table:: ARM CPU architectures
-    :widths: 30 30 30
+    :widths: 30 30 30 30
     :header-rows: 1
     :align: left
 
     * - CMake keyword
       - Architecture/Instruction set
       - Examples
+      - Notes
 
     * - ``Kokkos_ARCH_ARMV9_GRACE``
       - ARMv9-A/A64/neoverse-v2
       - GH200 @ CSCS ALPS
+      - (since Kokkos 4.4.1)
 
     * - ``Kokkos_ARCH_A64FX``
       - ARMv8.2/A64
       - A64FX @ Fugaku
+      -
 
     * - ``Kokkos_ARCH_ARMV8_THUNDERX2``
       - ARMv8/A64
       - ThunderX2 @ SNL Astra
         ThunderX2 @ CEA BullSequana
+      -
 
     * - ``Kokkos_ARCH_ARMV81``
       - ARMv8.1/A64,A32
       -
+      -
 
     * - ``Kokkos_ARCH_ARMV8_THUNDERX``
       - ARMv8/A64
       -
+      -
 
     * - ``Kokkos_ARCH_ARMV80``
       - ARMv8.0/A64,A32
       -
+      -
 
 .. list-table:: IBM CPU architectures
     :widths: 30 30 30