From 61dcca7836f8247247c1f7945b1e256a10e2f1f8 Mon Sep 17 00:00:00 2001 From: Istvan Kiss Date: Tue, 21 May 2024 12:18:06 +0200 Subject: [PATCH] SWDEV-464475 - Remove cluster block leftover Change-Id: I58db05dce38f10e64a9e1c6a919b93f8282a9a72 [ROCm/hip commit: 16a3843e5d1dbc9db57b5e0847f407b40a2424c9] --- .../memory_hierarchy.drawio | 38 +++++++------------ .../memory_hierarchy.svg | 2 +- .../programming_model_reference.rst | 17 +++------ 3 files changed, 19 insertions(+), 38 deletions(-) diff --git a/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.drawio b/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.drawio index cd6992c517..21c801a62d 100644 --- a/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.drawio +++ b/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.drawio @@ -1,23 +1,20 @@ - + - + - - - - + - + - + @@ -190,12 +187,6 @@ - - - - - - @@ -379,32 +370,29 @@ - - - - + - + - + - + - + - + - + - + diff --git a/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.svg b/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.svg index 425f943cd5..7599e7b5d3 100644 --- a/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.svg +++ b/projects/hip/docs/data/understand/programming_model_reference/memory_hierarchy.svg @@ -1 +1 @@ -Grid
Block
Block
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%26lt%3Bfont%20face%3D%26quot%3BKlavika%26quot%3B%20style%3D%26quot%3Bfont-size%3A%2017px%3B%26quot%3B%26gt%3BCluster%20shared%26lt%3B%2Ffont%26gt%3B%22%20style%3D%22text%3Bhtml%3D1%3BstrokeColor%3Dnone%3BfillColor%3Dnone%3Balign%3Dcenter%3BverticalAlign%3Dmiddle%3BwhiteSpace%3Dwrap%3Brounded%3D0%3BfontSize%3D17%3BfontColor%3D%23FFFFFF%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%221007.5%22%20y%3D%22150%22%20width%3D%22115%22%20height%3D%2230%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E
%3CmxGraphModel%3E...
Warp
Warp
Warp
Warp
Local
Local
Cluster shared
Cluster shared
Shared
Shared
Block
Block
Warp
Warp
Warp
Warp
Local
Local
Shared
Shared
Cluster
Cluster
Global
Global
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%26lt%3Bfont%20face%3D%26quot%3BKlavika%26quot%3B%20style%3D%26quot%3Bfont-size%3A%2017px%3B%26quot%3B%26gt%3BCluster%20shared%26lt%3B%2Ffont%26gt%3B%22%20style%3D%22text%3Bhtml%3D1%3BstrokeColor%3Dnone%3BfillColor%3Dnone%3Balign%3Dcenter%3BverticalAlign%3Dmiddle%3BwhiteSpace%3Dwrap%3Brounded%3D0%3BfontSize%3D17%3BfontColor%3D%23FFFFFF%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%221007.5%22%20y%3D%22150%22%20width%3D%22115%22%20height%3D%2230%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E
%3CmxGraphModel...
Constant
Constant
Texture
Texture
Surface
Surface
Text is not SVG - cannot display
\ No newline at end of file +Grid
Block
Block
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%26lt%3Bfont%20face%3D%26quot%3BKlavika%26quot%3B%20style%3D%26quot%3Bfont-size%3A%2017px%3B%26quot%3B%26gt%3BCluster%20shared%26lt%3B%2Ffont%26gt%3B%22%20style%3D%22text%3Bhtml%3D1%3BstrokeColor%3Dnone%3BfillColor%3Dnone%3Balign%3Dcenter%3BverticalAlign%3Dmiddle%3BwhiteSpace%3Dwrap%3Brounded%3D0%3BfontSize%3D17%3BfontColor%3D%23FFFFFF%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%221007.5%22%20y%3D%22150%22%20width%3D%22115%22%20height%3D%2230%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E
%3CmxGraphModel%3E...
Warp
Warp
Warp
Warp
Local
Local
Shared
Shared
Block
Block
Warp
Warp
Warp
Warp
Local
Local
Shared
Shared
Global
Global
%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22%26lt%3Bfont%20face%3D%26quot%3BKlavika%26quot%3B%20style%3D%26quot%3Bfont-size%3A%2017px%3B%26quot%3B%26gt%3BCluster%20shared%26lt%3B%2Ffont%26gt%3B%22%20style%3D%22text%3Bhtml%3D1%3BstrokeColor%3Dnone%3BfillColor%3Dnone%3Balign%3Dcenter%3BverticalAlign%3Dmiddle%3BwhiteSpace%3Dwrap%3Brounded%3D0%3BfontSize%3D17%3BfontColor%3D%23FFFFFF%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%221007.5%22%20y%3D%22150%22%20width%3D%22115%22%20height%3D%2230%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E
%3CmxGraphModel...
Constant
Constant
Texture
Texture
Surface
Surface
Text is not SVG - cannot display
\ No newline at end of file diff --git a/projects/hip/docs/understand/programming_model_reference.rst b/projects/hip/docs/understand/programming_model_reference.rst index dca1b5b9d8..b8b8216f6e 100644 --- a/projects/hip/docs/understand/programming_model_reference.rst +++ b/projects/hip/docs/understand/programming_model_reference.rst @@ -136,15 +136,11 @@ how they relate to the various levels of the threading model. .. figure:: ../data/understand/programming_model_reference/memory_hierarchy.svg :alt: Diagram depicting nested rectangles of varying color. The outermost one - titled "Grid", inside on the upper half a rectangle titled "Cluster". - Inside it are two identical rectangles titled "Block", inside them are - ones titled "Local" with multiple "Warp" titled rectangles. Blocks have - not just Local inside, but also rectangles titled "Shared". The Shared - rectangles of Blocks in the same Cluster are grouped together with a - translucent halo titled "Cluster shared". Outside the Cluster but - inside the Grid is a rectangle titled "Global" with three others - inside: "Surface", "Texture" (same color) and "Constant" (different - color). + titled "Grid", inside it are two identical rectangles titled "Block", + inside them are ones titled "Local" with multiple "Warp" titled rectangles. + Blocks have not just Local inside, but also rectangles titled "Shared". + Inside the Grid is a rectangle titled "Global" with three others inside: + "Surface", "Texture" (same color) and "Constant" (different color). Memory hierarchy. @@ -158,9 +154,6 @@ Local or per-thread memory Shared memory Read-write storage visible to all the threads in a given block. -Distributed shared memory - Read-write storage visible to all the threads in a given block cluster. - Global Read-write storage visible to all threads in a given grid. There are specialized versions of global memory with different usage semantics which