Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Correct supra single hasher core assignments #426

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: Correct supra single hasher core assignments #426

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3237f63
fix: supra: Correctly propagate hashers per thread config
magik6k Feb 26, 2025
aed9007
fix hasher math
magik6k Feb 27, 2025
3330735
correct number in assign
magik6k Feb 27, 2025
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
26 changes: 18 additions & 8 deletions tasks/sealsupra/supra_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"github.com/samber/lo"
)

const SectorsPerHasher = 2

type SystemInfo struct {
ProcessorCount int
CoreCount int
Expand Down Expand Up @@ -54,6 +56,8 @@ type SupraSealConfig struct {
P2WrRdOverlap bool
P2HsP1WrOverlap bool
P2HcP2RdOverlap bool

HashersPerCore int
}

type AdditionalSystemInfo struct {
Expand Down Expand Up @@ -151,20 +155,21 @@ func GenerateSupraSealConfig(info SystemInfo, dualHashers bool, batchSize int, n
P2WrRdOverlap: true,
P2HsP1WrOverlap: true,
P2HcP2RdOverlap: true,

HashersPerCore: 1,
}

sectorsPerThread := 1
if dualHashers {
sectorsPerThread = 2
config.HashersPerCore = 2
}

ccxFreeCores := info.CoresPerL3 - 1 // one core per ccx goes to the coordinator
ccxFreeThreads := ccxFreeCores * info.ThreadsPerCore
sectorsPerCCX := ccxFreeThreads * sectorsPerThread
ccxFreeThreads := ccxFreeCores * config.HashersPerCore
sectorsPerCCX := ccxFreeThreads * SectorsPerHasher

config.RequiredThreads = batchSize / sectorsPerThread
config.RequiredThreads = batchSize / SectorsPerHasher
config.RequiredCCX = (batchSize + sectorsPerCCX - 1) / sectorsPerCCX
config.RequiredCores = config.RequiredCCX + config.RequiredThreads/info.ThreadsPerCore
config.RequiredCores = config.RequiredCCX + config.RequiredThreads/config.HashersPerCore

if config.RequiredCores > info.CoreCount {
return config, fmt.Errorf("not enough cores available for hashers")
Expand Down Expand Up @@ -234,7 +239,7 @@ func GenerateSupraSealConfig(info SystemInfo, dualHashers bool, batchSize int, n

sectorConfig.Coordinators = append(sectorConfig.Coordinators, CoordinatorConfig{
Core: coreNum,
Hashers: (toAssign - 1) * info.ThreadsPerCore,
Hashers: (toAssign - 1) * config.HashersPerCore,
})

i -= toAssign
Expand Down Expand Up @@ -306,7 +311,12 @@ func FormatSupraSealConfig(config SupraSealConfig, system SystemInfo, additional
w(" qpair_writer = 1;")
w(" reader_sleep_time = 250;")
w(" writer_sleep_time = 500;")
w(" hashers_per_core = 2;")

if config.HashersPerCore == 2 {
w(" hashers_per_core = 2;")
} else {
w(" hashers_per_core = 1;")
}
w("")
w(" sector_configs: (")

Expand Down