fix automated_benchmarking

make it able to process text output sent into either stdout or stderr
This commit is contained in:
Yann Collet 2021-09-12 01:36:18 -07:00
parent 5449ede2e6
commit 640c5b1f77
2 changed files with 4 additions and 7 deletions

View File

@ -373,10 +373,7 @@ BMK_benchMemAdvancedNoAlloc(
if (adv->mode == BMK_decodeOnly) {
cSizes[nbBlocks] = thisBlockSize;
benchResult.cSize = thisBlockSize;
}
}
}
}
} } } }
/* warming up `compressedBuffer` */
if (adv->mode == BMK_decodeOnly) {

View File

@ -112,9 +112,9 @@ def parse_benchmark_output(output):
def benchmark_single(executable, level, filename):
return parse_benchmark_output((
subprocess.run(
[executable, "-qb{}".format(level), filename], stderr=subprocess.PIPE
[executable, "-qb{}".format(level), filename], stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
)
.stderr.decode("utf-8")
.stdout.decode("utf-8")
.split(" ")
))
@ -145,7 +145,7 @@ def benchmark(build, filenames, levels, iterations):
def benchmark_dictionary_single(executable, filenames_directory, dictionary_filename, level, iterations):
cspeeds, dspeeds = [], []
for _ in range(iterations):
output = subprocess.run([executable, "-qb{}".format(level), "-D", dictionary_filename, "-r", filenames_directory], stderr=subprocess.PIPE).stderr.decode("utf-8").split(" ")
output = subprocess.run([executable, "-qb{}".format(level), "-D", dictionary_filename, "-r", filenames_directory], stdout=subprocess.PIPE).stdout.decode("utf-8").split(" ")
cspeed, dspeed = parse_benchmark_output(output)
cspeeds.append(cspeed)
dspeeds.append(dspeed)