cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Support complex extra, fix small bug in covariance

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera 2020-06-30 02:56:58 +02:00
parent c68a8f802e
commit 5e7f561133
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmd/lotus-bench/import.go
View File

@ -296,7 +296,7 @@ func (cov1 *covar) Combine(cov2 *covar) {
out.m2 = cov1.m2 + cov2.m2 + dx*dx*cov1.n*cov2.n/out.n out.m2 = cov1.m2 + cov2.m2 + dx*dx*cov1.n*cov2.n/out.n
dy := cov1.meanY - cov2.meanY dy := cov1.meanY - cov2.meanY
out.meanY = cov1.meanY + dy*cov2.n/out.n out.meanY = cov1.meanY - dy*cov2.n/out.n
out.c = cov1.c + cov2.c + dx*dy*cov1.n*cov2.n/out.n out.c = cov1.c + cov2.c + dx*dy*cov1.n*cov2.n/out.n
*cov1 = out *cov1 = out
@ -362,6 +362,30 @@ func (v1 *meanVar) Combine(v2 *meanVar) {
v1.m2 = m2 v1.m2 = m2
} }
func getExtras(ex interface{}) (*string, *float64) {
if t, ok := ex.(string); ok {
return &t, nil
}
if size, ok := ex.(float64); ok {
return nil, &size
}
if exMap, ok := ex.(map[string]interface{}); ok {
t, tok := exMap["type"].(string)
size, sok := exMap["size"].(float64)
if tok && sok {
return &t, &size
}
if tok {
return &t, nil
}
if sok {
return nil, &size
}
return nil, nil
}
return nil, nil
}
func tallyGasCharges(charges map[string]*stats, et types.ExecutionTrace) { func tallyGasCharges(charges map[string]*stats, et types.ExecutionTrace) {
for i, gc := range et.GasCharges { for i, gc := range et.GasCharges {
name := gc.Name name := gc.Name
@ -376,8 +400,9 @@ func tallyGasCharges(charges map[string]*stats, et types.ExecutionTrace) {
} }
tt += float64(prev.TimeTaken.Nanoseconds()) tt += float64(prev.TimeTaken.Nanoseconds())
} }
if eString, ok := gc.Extra.(string); ok { eType, eSize := getExtras(gc.Extra)
name += "-" + eString if eType != nil {
name += "-" + *eType
} }
compGas := gc.VirtualComputeGas compGas := gc.VirtualComputeGas
if compGas == 0 { if compGas == 0 {
@ -389,13 +414,13 @@ func tallyGasCharges(charges map[string]*stats, et types.ExecutionTrace) {
charges[name] = s charges[name] = s
} }
if extra, ok := gc.Extra.(float64); ok { if eSize != nil {
if s.extraCovar == nil { if s.extraCovar == nil {
s.extraCovar = &covar{} s.extraCovar = &covar{}
s.extra = &meanVar{} s.extra = &meanVar{}
} }
s.extraCovar.AddPoint(extra, tt) s.extraCovar.AddPoint(*eSize, tt)
s.extra.AddPoint(extra) s.extra.AddPoint(*eSize)
} }
s.timeTaken.AddPoint(tt) s.timeTaken.AddPoint(tt)