This repository has been archived by the owner on Apr 8, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
Fixed lookup buffer size calculation for Vulkan implementation. #99
Open
AndrewAR2
wants to merge
10
commits into
spacemeshos:develop
Choose a base branch
from
AndrewAR2:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f38e322
Added -N option to the test app to set the Scrypt N parameter.
AndrewAR2 d447367
Fixed lookup buffer size calculation for Vulkan implementation.
AndrewAR2 0c1e113
Fix shaders-gen flags for Debug build.
AndrewAR2 9e5fdd2
Fix wrong thread concurrency value
AndrewAR2 07b449f
Add more logs
AndrewAR2 5e7ac5e
Fix error in logs
AndrewAR2 e396d17
Fix max allocation size
AndrewAR2 4ee20a7
Fix CUDA batch size
AndrewAR2 1ad1db1
Use gpu_memory if gpu_max_alloc == 0
AndrewAR2 b268d5d
Fix optimal blocks for CUDA
AndrewAR2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -113,7 +113,7 @@ static _vulkanState *initVulkan(struct cgpu_info *cgpu, char *name, size_t nameS | |
{ | ||
_vulkanState *state = (_vulkanState *)calloc(1, sizeof(_vulkanState)); | ||
|
||
uint32_t scrypt_mem = 128 * cgpu->r; | ||
uint32_t scrypt_mem = 128 * cgpu->r * cgpu->N; | ||
|
||
uint32_t computeQueueFamilyIndex = getComputeQueueFamilyIndex(cgpu->driver_id); | ||
if (computeQueueFamilyIndex < 0) { | ||
|
@@ -135,32 +135,24 @@ static _vulkanState *initVulkan(struct cgpu_info *cgpu, char *name, size_t nameS | |
gVulkan.vkFreeMemory(state->vkDevice, tmpMem, NULL); | ||
|
||
cgpu->work_size = 64; | ||
|
||
applog(LOG_NOTICE, "GPU %d: selecting lookup gap of 4", cgpu->driver_id); | ||
cgpu->lookup_gap = 4; | ||
|
||
unsigned int bsize = 1024; | ||
size_t ipt = (bsize / cgpu->lookup_gap + (bsize % cgpu->lookup_gap > 0)); | ||
size_t ipt = scrypt_mem / cgpu->lookup_gap; | ||
|
||
if (!cgpu->buffer_size) { | ||
unsigned int base_alloc = (int)(cgpu->gpu_max_alloc * 88 / 100 / 1024 / 1024 / 8) * 8 * 1024 * 1024; | ||
cgpu->thread_concurrency = (uint32_t)(base_alloc / scrypt_mem / ipt); | ||
unsigned int base_alloc = (int)(cgpu->gpu_max_alloc * 92 / 100 / 1024 / 1024 / 8) * 8 * 1024 * 1024; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why use 92% of max memory? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A value of 88% is generally accepted, but this is a legacy of cards with 4G memory or less. 92% is performance improvement and is acceptable as long as there are no memory allocation errors. In fact, for cards with more than 4G memory, a value of 100% is acceptable. |
||
cgpu->thread_concurrency = (uint32_t)(base_alloc / ipt); | ||
cgpu->buffer_size = base_alloc / 1024 / 1024; | ||
applog(LOG_DEBUG, "88%% Max Allocation: %u", base_alloc); | ||
applog(LOG_DEBUG, "92%% Max Allocation: %u", base_alloc); | ||
applog(LOG_NOTICE, "GPU %d: selecting buffer_size of %zu", cgpu->driver_id, cgpu->buffer_size); | ||
} | ||
|
||
if (cgpu->buffer_size) { | ||
// use the buffer-size to overwrite the thread-concurrency | ||
cgpu->thread_concurrency = (int)((cgpu->buffer_size * 1024 * 1024) / ipt / scrypt_mem); | ||
} | ||
|
||
cgpu->thread_concurrency = min(cgpu->thread_concurrency, /*cgpu->work_size*/ 32 * 1024); | ||
cgpu->thread_concurrency = min(cgpu->thread_concurrency, 32 * 1024); | ||
uint32_t chunkSize = copy_only ? (cgpu->thread_concurrency * 32) : ((cgpu->thread_concurrency * hash_len_bits + 7) / 8); | ||
|
||
applog(LOG_DEBUG, "GPU %d: setting thread_concurrency to %d based on buffer size %d and lookup gap %d", cgpu->driver_id, (int)(cgpu->thread_concurrency), (int)(cgpu->buffer_size), (int)(cgpu->lookup_gap)); | ||
|
||
state->bufSize = alignBuffer(scrypt_mem * ipt * cgpu->thread_concurrency, state->alignment); | ||
state->bufSize = alignBuffer(ipt * cgpu->thread_concurrency, state->alignment); | ||
state->memConstantSize = alignBuffer(sizeof(AlgorithmConstants), state->alignment); | ||
state->memParamsSize = alignBuffer(sizeof(AlgorithmParams), state->alignment); | ||
state->memInputSize = alignBuffer(PREIMAGE_SIZE, state->alignment); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please document and explain in comments the logic behind calculations of buffers/memory sizes in this function and what variables mean (for example, what "ipt" stands for)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Scrypt memory size in bytes scrypt_mem = 128 * r * N
Lookup gap reduces memory usage but increases computational complexity. With lookup gap memory usage is
ipt = scrypt_mem / lookup_gap
max concurrent threads = allocated_buffer_size / ipt