Skip to content

Commit 9cbd346

Browse files
committed
Merge bitcoin/bitcoin#33340: Fix benchmark CSV output
790b440 Fix benchmark CSV output (Hennadii Stepanov) Pull request description: The `SHA256AutoDetect` return output is used, among other use cases, to name benchmarks. Using a comma breaks the `bench_bitcoin` CSV output. This PR replaces the comma with a semicolon, which fixes bitcoin/bitcoin#33331. ACKs for top commit: Raimo33: Code Review ACK 790b440 l0rinc: Code review ACK 790b440 janb84: code review ACK 790b440 Tree-SHA512: 096bfa29a0639a4d97d510a3e2a15f071f384148c3035e4d0fc525794682e499c45a0d0c95728d5c78010098393b2c486a7fa9c21c1e2fbb600dea7c5638a55f
2 parents 4776179 + 790b440 commit 9cbd346

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/crypto/sha256.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ std::string SHA256AutoDetect(sha256_implementation::UseImplementation use_implem
625625
Transform = sha256_x86_shani::Transform;
626626
TransformD64 = TransformD64Wrapper<sha256_x86_shani::Transform>;
627627
TransformD64_2way = sha256d64_x86_shani::Transform_2way;
628-
ret = "x86_shani(1way,2way)";
628+
ret = "x86_shani(1way;2way)";
629629
have_sse4 = false; // Disable SSE4/AVX2;
630630
have_avx2 = false;
631631
}
@@ -639,14 +639,14 @@ std::string SHA256AutoDetect(sha256_implementation::UseImplementation use_implem
639639
#endif
640640
#if defined(ENABLE_SSE41)
641641
TransformD64_4way = sha256d64_sse41::Transform_4way;
642-
ret += ",sse41(4way)";
642+
ret += ";sse41(4way)";
643643
#endif
644644
}
645645

646646
#if defined(ENABLE_AVX2)
647647
if (have_avx2 && have_avx && enabled_avx) {
648648
TransformD64_8way = sha256d64_avx2::Transform_8way;
649-
ret += ",avx2(8way)";
649+
ret += ";avx2(8way)";
650650
}
651651
#endif
652652
#endif // defined(HAVE_GETCPUID)
@@ -680,7 +680,7 @@ std::string SHA256AutoDetect(sha256_implementation::UseImplementation use_implem
680680
Transform = sha256_arm_shani::Transform;
681681
TransformD64 = TransformD64Wrapper<sha256_arm_shani::Transform>;
682682
TransformD64_2way = sha256d64_arm_shani::Transform_2way;
683-
ret = "arm_shani(1way,2way)";
683+
ret = "arm_shani(1way;2way)";
684684
}
685685
#endif
686686
#endif // DISABLE_OPTIMIZED_SHA256

0 commit comments

Comments
 (0)