update README

update help message
Umio-Yasuno · Mar 23, 2021 · 5a93e07 · 5a93e07
1 parent 6797835
commit 5a93e07
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -14,38 +14,41 @@ Usage:
 FLAGS:
   -ni, -noinfo			do not display spec list
   -nd, -nodia			do not display diagram
-  -nogfx			do not display gfx block
+  -ng, -nogfx			do not display gfx block (for diagram)
   				  (RB, Rasterizer/Primitive, Geometry)
-  -rbplus			RB+ enable (for override) (RB = 4ROP, RB+ = 8ROP)
+  -rbplus			RB+ (for override)
+  				  (RB == 4-ROP, RB+ == 8-ROP) 
   -h, --help			display this help and exit
 
 OPTIONS:
   --col=NUM			setting number of diagram column (default: 2)
   --arch=gfx(9|10|10.3)		override GFX IP/Architecture
   --se=NUM			override number of ShaderEngine
-  --sa-per-se=NUM		override number of ShaderArray per ShaderEngine
-  --cu-per-sa=NUM		override number of CU per ShaderArray
-  --min-cu-per-sa=NUM		override number of min CU per ShaderArray
+  --sa-per-se=NUM, --sps=NUM	override number of ShaderArray per ShaderEngine
+  --cu-per-sa=NUM, --cps=NUM	override number of CU per ShaderArray
+  --min-cu-per-sa=NUM, --mcps=NUM
+  				override number of min CU per ShaderArray
   --rb=NUM			override number of RenderBackend
-  --l2c-block=NUM		override number of L2cache block
-  --l2c-cache=NUM		override L2cache size (MB)
-
+  --l2c-block=NUM, --l2cb=NUM	override number of L2cache block
+  --l2c-size=NUM, --l2cs=NUM	override L2cache size (KiB)
+  
   -image			output image of diagram
-  				      output to: /tmp/<GPU_NAME>-diagram.png
-  				      requirement: imagemagick, "Dejavu Sans Mono" font
+  				  output to: /tmp/<GPU_NAME>-diagram.png
+  				  requirement: imagemagick, "Dejavu Sans Mono" font
 
 ```
 
 ## Result Example
 
 ```
 
-Driver Version:		Mesa 21.0.0-devel (git-3898f747ce)
+Driver Version:		Mesa 21.1.0-devel (git-23100f3b65)
 
 GPU ASIC:		POLARIS11
 Chip class:		GFX8
 Marketing Name:		Radeon RX 560 Series
 GPU Type:		Discrete GPU
+DeviceID:		0x67ff:0xcf
 
 Compute Units:		  16 CU
 GFX Clock Range:	 214 MHz - 1080 MHz
@@ -71,7 +74,7 @@ L2 Cache Size:		  1 MB (1024 KB)
 
 Power cap:		 48 W
 
-Card Interface:		PCIe Gen3 x8 
+Card Interface:		PCIe Gen3x8 
 
 AMD Smart Access Memory
 
@@ -93,6 +96,7 @@ AMD Smart Access Memory
  | +--------------------------------+ |  | +--------------------------------+ | 
  |      [- Geometry Processor -]      |  |      [- Geometry Processor -]      | 
  +------------------------------------+  +------------------------------------+ 
-        [L2$ 256K]        [L2$ 256K]        [L2$ 256K]        [L2$ 256K]
+
+    [L2$ 256K]    [L2$ 256K]    [L2$ 256K]    [L2$ 256K]
 
 ```
diff --git a/amdgpu-diagram-output.sh b/amdgpu-diagram-output.sh
@@ -55,21 +55,22 @@ printf -- "\nUsage:\n  $(basename ${0}) [FLAGS] [OPTION]...
 \nFLAGS:
   -ni, -noinfo\t\t\tdo not display spec list
   -nd, -nodia\t\t\tdo not display diagram
-  -nogfx\t\t\tdo not display gfx block (for diagram)
+  -ng, -nogfx\t\t\tdo not display gfx block (for diagram)
   \t\t\t\t  (RB, Rasterizer/Primitive, Geometry)
   -rbplus\t\t\tRB+ (for override)
-  \t\t\t\t  (RB = 4ROP, RB+ = 8ROP) 
+  \t\t\t\t  (RB == 4-ROP, RB+ == 8-ROP) 
   -h, --help\t\t\tdisplay this help and exit
 \nOPTIONS:
   --col=NUM\t\t\tsetting number of diagram column (default: 2)
   --arch=gfx(9|10|10.3)\t\toverride GFX IP/Architecture
   --se=NUM\t\t\toverride number of ShaderEngine
-  --sa-per-se=NUM\t\toverride number of ShaderArray per ShaderEngine
-  --cu-per-sa=NUM\t\toverride number of CU per ShaderArray
-  --min-cu-per-sa=NUM\t\toverride number of min CU per ShaderArray
+  --sa-per-se=NUM, --sps=NUM\toverride number of ShaderArray per ShaderEngine
+  --cu-per-sa=NUM, --cps=NUM\toverride number of CU per ShaderArray
+  --min-cu-per-sa=NUM, --mcps=NUM
+  \t\t\t\toverride number of min CU per ShaderArray
   --rb=NUM\t\t\toverride number of RenderBackend
-  --l2c-block=NUM\t\toverride number of L2cache block
-  --l2c-size=NUM\t\toverride L2cache size (KiB)
+  --l2c-block=NUM, --l2cb=NUM\toverride number of L2cache block
+  --l2c-size=NUM, --l2cs=NUM\toverride L2cache size (KiB)
   \n  -image\t\t\toutput image of diagram
   \t\t\t\t  output to: /tmp/<GPU_NAME>-diagram.png
   \t\t\t\t  requirement: imagemagick, \"Dejavu Sans Mono\" font
@@ -144,7 +145,7 @@ for opt in ${@}; do
     NO_INFO="1" ;;
   "-nd"|"-nodia")
     NO_DIAGRAM="1" ;;
-  "-nogfx"|"-ng")
+  "-ng"|"-nogfx")
     HAS_GFX="0" ;;
   "--arch="*)
     case "${opt#*=}" in
@@ -175,7 +176,7 @@ for opt in ${@}; do
     _arg_judge ${opt}
     CU_PER_SA="${opt#*=}"
     MIN_CU_PER_SA="${opt#*=}" ;;
-  "--min-cu-per-sa="*)
+  "--min-cu-per-sa="*|"--mcps"*)
     _arg_judge ${opt}
     MIN_CU_PER_SA="${opt#*=}" ;;
   "--rb="*)