commit 0431073aa738e4d9165bd0a1908ab7acb67bbeb5
author James Price <jrprice@google.com> Mon Aug 19 20:38:51 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 19 20:38:51 2024 +0000
tree f548351294f1d2182942c89f53aaf224dce22f50
parent 56958055a30cf32fcef221fd845ee975cb238bcf

[benchmark] Skip CR in generated shaders

This makes the generated shaders consistent between Windows and
non-Windows.

Bug: 42251293
Change-Id: Ida030a70f4fe61bb93c75a3293270c336f82fc13
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/203115
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

src/tint/cmd/bench/generate_benchmark_inputs.py

diff --git a/src/tint/cmd/bench/generate_benchmark_inputs.py b/src/tint/cmd/bench/generate_benchmark_inputs.py
index ccaba46..c5185e5 100644
--- a/src/tint/cmd/bench/generate_benchmark_inputs.py
+++ b/src/tint/cmd/bench/generate_benchmark_inputs.py
@@ -121,6 +121,9 @@
             print(f'    {{"{f}", {{', file=output, end='')
             i = 0
             for char in input.read():
+                if char == ord('\r'):
+                    # Skip carriage return to make output consistent across platforms.
+                    continue
                 if (i % 16) == 0:
                     print('\n    ', file=output, end='')
                 print(' ' + str(char), file=output, end=',')