Skip to content

Commit eacfce8

Browse files
palimondoDavide Italiano
authored andcommitted
[benchmark] Gardening: Sensibly rename variables
To make sense of this spaghetti code, let’s first use reasonable variable names: * scale -> numIters * elapsed_time -> time
1 parent e598ee1 commit eacfce8

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

benchmark/utils/DriverUtils.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -426,39 +426,39 @@ func runBench(_ test: BenchmarkInfo, _ c: TestConfig) -> BenchResults? {
426426
test.setUpFunction?()
427427

428428
for s in 0..<c.numSamples {
429-
var scale : Int
430-
var elapsed_time : Int = 0
429+
var numIters : Int
430+
var time: Int = 0
431431
if c.fixedNumIters == 0 {
432-
elapsed_time = sampler.measure(test.name, fn: testFn, numIters: 1)
432+
time = sampler.measure(test.name, fn: testFn, numIters: 1)
433433

434-
if elapsed_time > 0 {
434+
if time > 0 {
435435
let usPerSecond = 1_000_000.0 // microseconds (μs)
436436
let timePerSample = Int(c.sampleTime * usPerSecond)
437437
/// Number of iterations to make `testFn` run for the desired time.
438-
scale = timePerSample / elapsed_time
438+
numIters = timePerSample / time
439439
} else {
440440
logVerbose(" Warning: elapsed time is 0!")
441-
scale = 1
441+
numIters = 1
442442
}
443443
} else {
444444
// Compute the scaling factor if a fixed c.fixedNumIters is not specified.
445-
scale = c.fixedNumIters
446-
if scale == 1 {
447-
elapsed_time = sampler.measure(test.name, fn: testFn, numIters: 1)
445+
numIters = c.fixedNumIters
446+
if numIters == 1 {
447+
time = sampler.measure(test.name, fn: testFn, numIters: 1)
448448
}
449449
}
450450
// Make integer overflow less likely on platforms where Int is 32 bits wide.
451451
// FIXME: Switch BenchmarkInfo to use Int64 for the iteration scale, or fix
452452
// benchmarks to not let scaling get off the charts.
453-
scale = min(scale, Int.max / 10_000)
453+
numIters = min(numIters, Int.max / 10_000)
454454

455455
// Rerun the test with the computed scale factor.
456-
if scale > 1 {
457-
logVerbose(" Measuring with scale \(scale).")
458-
elapsed_time = sampler.measure(test.name, fn: testFn, numIters: scale)
456+
if numIters > 1 {
457+
logVerbose(" Measuring with scale \(numIters).")
458+
time = sampler.measure(test.name, fn: testFn, numIters: numIters)
459459
}
460460

461-
samples[s] = elapsed_time
461+
samples[s] = time
462462
logVerbose(" Sample \(s),\(samples[s])")
463463
}
464464
test.tearDownFunction?()

0 commit comments

Comments
 (0)