Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tools/topology/topology2/cavs-nocodec.conf
Original file line number Diff line number Diff line change
Expand Up @@ -698,9 +698,9 @@ IncludeByKey.PASSTHROUGH {
IncludeByKey.SRC_DOMAIN {
"DP" {
core_id $DP_SRC_CORE_ID
domain_id 123
stack_bytes_requirement 4096
heap_bytes_requirement 8192
domain_id 0
stack_bytes_requirement 2048
heap_bytes_requirement "$[(24 * 1024)]"
Comment on lines +701 to +703

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Topology parser evaluates expressions enclosed in $[] .

}
}
}
Expand Down Expand Up @@ -1382,9 +1382,9 @@ IncludeByKey.PASSTHROUGH {
IncludeByKey.SRC_DOMAIN {
"DP" {
core_id $DP_SRC_CORE_ID
domain_id 123
stack_bytes_requirement 4096
heap_bytes_requirement 8192
domain_id 0
stack_bytes_requirement 2048
heap_bytes_requirement "$[(24 * 1024)]"
}
}

Expand Down
4 changes: 1 addition & 3 deletions tools/topology/topology2/include/common/tokens.conf
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ Object.Base.VendorToken {
scheduler_domain 418
domain_id 419
stack_bytes_requirement 420
interim_heap_bytes_requirement 421
lifetime_heap_bytes_requirement 422
shared_bytes_requirement 423
heap_bytes_requirement 421
}
Comment on lines 28 to 32

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes mostly revert the changes made in 83390bd and there has not been any SOF release in between those. These extra attributes are not needed AFAICT so I do not think we should have them.


"2" {
Expand Down
27 changes: 3 additions & 24 deletions tools/topology/topology2/include/components/widget-common.conf
Original file line number Diff line number Diff line change
Expand Up @@ -149,33 +149,12 @@ DefineAttribute."stack_bytes_requirement" {
token_ref "comp.word"
}

## Interim Heap size requirement in bytes for this component.
## Used for resources that may change in size or be freed during the lifetime of the component.
## In practice this means anything allocated outside module's init() call-back.
DefineAttribute."interim_heap_bytes_requirement" {
# Token set reference name and type
token_ref "comp.word"
}

## Lifetime heap memory allocation requirement in bytes for this component.
## This token's value indicates the amount of allocated memory needed at component init phase
## and used over the lifetime of the component until the component is destroyed.
## In practice this means anything allocated in init() call-back.
DefineAttribute."lifetime_heap_bytes_requirement" {
# Token set reference name and type
token_ref "comp.word"
}

## Shared memory allocation requirement in bytes for this component.
## This token's value indicates the amount of shared memory the component may need to allocated.
## Shared memory may be shared to other components.
DefineAttribute."shared_bytes_requirement" {
## Heap size requirement in bytes for this component.
DefineAttribute."heap_bytes_requirement" {
# Token set reference name and type
token_ref "comp.word"
}
Comment on lines +152 to 156

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The FW will decide the division between different memory types. All that is needed is the amount of memory required. There is no need to add any more information here.


# These default values are here until we have measured module specific numbers
stack_bytes_requirement 8192
interim_heap_bytes_requirement 4096
lifetime_heap_bytes_requirement 16384
shared_bytes_requirement 4096
heap_bytes_requirement 24576

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are repeating yourself

Loading