[PATCH] Update NV SIMD-per-CU to 2

[PATCH] Update NV SIMD-per-CU to 2

[Joseph Greathouse]

Navi series GPUs have 2 SIMDs per CU (and then 2 CUs per WGP).
The NV enum headers incorrectly listed this as 4, which later meant
we were incorrectly reporting the number of SIMDs in the HSA
topology. This could cause problems down the line for user-space
applications that want to launch a fixed amount of work to each
SIMD.

Signed-off-by: Joseph Greathouse <Joseph.Greathouse@amd.com>
Change-Id: I94021ca71363a3d27330b2fda8e6acaac258017e
---
 drivers/gpu/drm/amd/include/navi10_enum.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/include/navi10_enum.h b/drivers/gpu/drm/amd/include/navi10_enum.h
index d5ead9680c6e..84bcb96f76ea 100644
--- a/drivers/gpu/drm/amd/include/navi10_enum.h
+++ b/drivers/gpu/drm/amd/include/navi10_enum.h
@@ -430,7 +430,7 @@ ARRAY_2D_DEPTH                           = 0x00000001,
  */
 
 typedef enum ENUM_NUM_SIMD_PER_CU {
-NUM_SIMD_PER_CU                          = 0x00000004,
+NUM_SIMD_PER_CU                          = 0x00000002,
 } ENUM_NUM_SIMD_PER_CU;
 
 /*
-- 
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] Update NV SIMD-per-CU to 2

[Deucher, Alexander]

[-- Attachment #1.1: Type: text/plain, Size: 2224 bytes --]

[AMD Official Use Only - Internal Distribution Only]

Please fix the subject:
drm/amdgpu: Update NV SIMD-per-CU to 2
With that fixed, the patch is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Joseph Greathouse <Joseph.Greathouse@amd.com>
Sent: Monday, May 3, 2021 1:25 PM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Greathouse, Joseph <Joseph.Greathouse@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>
Subject: [PATCH] Update NV SIMD-per-CU to 2

Navi series GPUs have 2 SIMDs per CU (and then 2 CUs per WGP).
The NV enum headers incorrectly listed this as 4, which later meant
we were incorrectly reporting the number of SIMDs in the HSA
topology. This could cause problems down the line for user-space
applications that want to launch a fixed amount of work to each
SIMD.

Signed-off-by: Joseph Greathouse <Joseph.Greathouse@amd.com>
Change-Id: I94021ca71363a3d27330b2fda8e6acaac258017e
---
 drivers/gpu/drm/amd/include/navi10_enum.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/include/navi10_enum.h b/drivers/gpu/drm/amd/include/navi10_enum.h
index d5ead9680c6e..84bcb96f76ea 100644
--- a/drivers/gpu/drm/amd/include/navi10_enum.h
+++ b/drivers/gpu/drm/amd/include/navi10_enum.h
@@ -430,7 +430,7 @@ ARRAY_2D_DEPTH                           = 0x00000001,
  */

 typedef enum ENUM_NUM_SIMD_PER_CU {
-NUM_SIMD_PER_CU                          = 0x00000004,
+NUM_SIMD_PER_CU                          = 0x00000002,
 } ENUM_NUM_SIMD_PER_CU;

 /*
--
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Calexander.deucher%40amd.com%7C0a03ae95bbda46750ed308d90e588bc6%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637556595746142277%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=JAHxu%2FPQTzHASsbie%2FnJGRX9B%2F17%2B6%2FXWeQnadzkj1I%3D&amp;reserved=0

[-- Attachment #1.2: Type: text/html, Size: 4511 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] Update NV SIMD-per-CU to 2

[Felix Kuehling]

Am 2021-05-03 um 1:25 p.m. schrieb Joseph Greathouse:
> Navi series GPUs have 2 SIMDs per CU (and then 2 CUs per WGP).
> The NV enum headers incorrectly listed this as 4, which later meant
> we were incorrectly reporting the number of SIMDs in the HSA
> topology. This could cause problems down the line for user-space
> applications that want to launch a fixed amount of work to each
> SIMD.
>
> Signed-off-by: Joseph Greathouse <Joseph.Greathouse@amd.com>
> Change-Id: I94021ca71363a3d27330b2fda8e6acaac258017e

Please remove the Change-Id. You can disable generation of Change-Ids in
your kernel repository with this command:

    git config --bool gerrit.createChangeId false

The change looks good to me. As far as I can see in the code this would
fix both the simd_count and simd_per_cu properties in the KFD topology.
I don't see this value used anywhere else in amdgpu, so there shouldn't
be any other unexpected side effects.

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


> ---
>  drivers/gpu/drm/amd/include/navi10_enum.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/include/navi10_enum.h b/drivers/gpu/drm/amd/include/navi10_enum.h
> index d5ead9680c6e..84bcb96f76ea 100644
> --- a/drivers/gpu/drm/amd/include/navi10_enum.h
> +++ b/drivers/gpu/drm/amd/include/navi10_enum.h
> @@ -430,7 +430,7 @@ ARRAY_2D_DEPTH                           = 0x00000001,
>   */
>  
>  typedef enum ENUM_NUM_SIMD_PER_CU {
> -NUM_SIMD_PER_CU                          = 0x00000004,
> +NUM_SIMD_PER_CU                          = 0x00000002,
>  } ENUM_NUM_SIMD_PER_CU;
>  
>  /*
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx