configs: Set valid heap_type values

The variables that were used to set heap_type don't exist.
Explicitly set them to the proper values.

Also add pointer to what heap value means in the ROCm stack.

Change-Id: I8df7fca7442f6640be1154ef147c4e302ea491bb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47528
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Reviewed-by: Matthew Poremba <matthew.poremba@amd.com>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Kyle Roarty
2021-06-30 16:36:49 -05:00
committed by Matt Sinclair
parent ab9e28ddb8
commit 29372c8bff

View File

@@ -140,7 +140,9 @@ def createVegaTopology(options):
# CPU memory reporting
mem_dir = joinpath(node_dir, 'mem_banks/0')
remake_dir(mem_dir)
mem_prop = 'heap_type %s\n' % HsaHeaptype.HSA_HEAPTYPE_SYSTEM.value + \
# Heap type value taken from real system, heap type values:
# https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/blob/roc-4.0.x/include/hsakmttypes.h#L317
mem_prop = 'heap_type 0\n' + \
'size_in_bytes 33704329216\n' + \
'flags 0\n' + \
'width 72\n' + \
@@ -221,7 +223,9 @@ def createVegaTopology(options):
# TODO: Extract size, clk, and width from sim paramters
mem_dir = joinpath(node_dir, 'mem_banks/0')
remake_dir(mem_dir)
mem_prop = 'heap_type %s\n' % heap_type.value + \
# Heap type value taken from real system, heap type values:
# https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/blob/roc-4.0.x/include/hsakmttypes.h#L317
mem_prop = 'heap_type 1\n' + \
'size_in_bytes 17163091968\n' + \
'flags 0\n' + \
'width 2048\n' + \
@@ -316,6 +320,8 @@ def createFijiTopology(options):
# CPU memory reporting
mem_dir = joinpath(node_dir, 'mem_banks/0')
remake_dir(mem_dir)
# Heap type value taken from real system, heap type values:
# https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/blob/roc-4.0.x/include/hsakmttypes.h#L317
mem_prop = 'heap_type 0\n' + \
'size_in_bytes 33704329216\n' + \
'flags 0\n' + \
@@ -394,6 +400,8 @@ def createFijiTopology(options):
# TODO: Extract size, clk, and width from sim paramters
mem_dir = joinpath(node_dir, 'mem_banks/0')
remake_dir(mem_dir)
# Heap type value taken from real system, heap type values:
# https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/blob/roc-4.0.x/include/hsakmttypes.h#L317
mem_prop = 'heap_type 1\n' + \
'size_in_bytes 4294967296\n' + \
'flags 0\n' + \
@@ -471,6 +479,8 @@ def createCarrizoTopology(options):
mem_dir = joinpath(node_dir, f'mem_banks/{i}')
remake_dir(mem_dir)
# Heap type value taken from real system, heap type values:
# https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/blob/roc-4.0.x/include/hsakmttypes.h#L317
mem_prop = f'heap_type 0\n' + \
f'size_in_bytes {toMemorySize(options.mem_size)}' + \
f'flags 0\n' + \