Revert "formatting changes"

This reverts commit 6d5ae7e.

Author: boomanaiden154

libcxx/test/benchmarks/spec.gen.py

@@ -65,27 +65,19 @@
 spec_benchmarks &= no_fortran
 
 for benchmark in spec_benchmarks:
-    print(f"#--- {benchmark}.sh.test")
-    print(f"RUN: rm -rf %{temp}")  # clean up any previous (potentially incomplete) run
-    print(f"RUN: mkdir %{temp}")
-    print(f"RUN: cp {spec_config} %{temp}/spec-config.cfg")
-    print(
-        f"RUN: %{{spec_dir}}/bin/runcpu --config %{temp}/spec-config.cfg --size train --output-root %{temp} --rebuild {benchmark}"
-    )
-    print(
-        f"RUN: rm -rf %{temp}/benchspec"
-    )  # remove the temporary directory, which can become quite large
+    print(f'#--- {benchmark}.sh.test')
+    print(f'RUN: rm -rf %{temp}') # clean up any previous (potentially incomplete) run
+    print(f'RUN: mkdir %{temp}')
+    print(f'RUN: cp {spec_config} %{temp}/spec-config.cfg')
+    print(f'RUN: %{{spec_dir}}/bin/runcpu --config %{temp}/spec-config.cfg --size train --output-root %{temp} --rebuild {benchmark}')
+    print(f'RUN: rm -rf %{temp}/benchspec') # remove the temporary directory, which can become quite large
 
     # The `runcpu` command above doesn't fail even if the benchmark fails to run. To determine failure, parse the CSV
     # results and ensure there are no compilation errors or runtime errors in the status row. Also print the logs and
     # fail if there are no CSV files at all, which implies a SPEC error.
-    print(
-        f'RUN: %{{libcxx-dir}}/utils/parse-spec-results --extract "Base Status" --keep-failed %{temp}/result/*.train.csv > %{temp}/status || ! cat %{temp}/result/*.log'
-    )
+    print(f'RUN: %{{libcxx-dir}}/utils/parse-spec-results --extract "Base Status" --keep-failed %{temp}/result/*.train.csv > %{temp}/status || ! cat %{temp}/result/*.log')
     print(f'RUN: ! grep -E "CE|RE" %{temp}/status || ! cat %{temp}/result/*.log')
 
     # If there were no errors, parse the results into LNT-compatible format and print them.
-    print(
-        f"RUN: %{{libcxx-dir}}/utils/parse-spec-results %{temp}/result/*.train.csv --output-format=lnt > %{temp}/results.lnt"
-    )
-    print(f"RUN: cat %{temp}/results.lnt")
+    print(f'RUN: %{{libcxx-dir}}/utils/parse-spec-results %{temp}/result/*.train.csv --output-format=lnt > %{temp}/results.lnt')
+    print(f'RUN: cat %{temp}/results.lnt')

libcxx/utils/libcxx/test/format.py

@@ -178,14 +178,11 @@ def parseScript(test, preamble):
                 "%dbg(MODULE std.compat) %{cxx} %{flags} "
                 f"{compileFlags} "
                 "-Wno-reserved-module-identifier -Wno-reserved-user-defined-literal "
-                "-fmodule-file=std=%{temp}/std.pcm "  # The std.compat module imports std.
+                "-fmodule-file=std=%{temp}/std.pcm " # The std.compat module imports std.
                 "--precompile -o %{temp}/std.compat.pcm -c %{module-dir}/std.compat.cppm",
             )
             moduleCompileFlags.extend(
-                [
-                    "-fmodule-file=std.compat=%{temp}/std.compat.pcm",
-                    "%{temp}/std.compat.pcm",
-                ]
+                ["-fmodule-file=std.compat=%{temp}/std.compat.pcm", "%{temp}/std.compat.pcm"]
             )
 
         # Make sure the std module is built before std.compat. Libc++'s
@@ -200,9 +197,7 @@ def parseScript(test, preamble):
             "-Wno-reserved-module-identifier -Wno-reserved-user-defined-literal "
             "--precompile -o %{temp}/std.pcm -c %{module-dir}/std.cppm",
         )
-        moduleCompileFlags.extend(
-            ["-fmodule-file=std=%{temp}/std.pcm", "%{temp}/std.pcm"]
-        )
+        moduleCompileFlags.extend(["-fmodule-file=std=%{temp}/std.pcm", "%{temp}/std.pcm"])
 
         # Add compile flags required for the modules.
         substitutions = config._appendToSubstitution(
@@ -360,15 +355,9 @@ def execute(self, test, litConfig):
                 "%dbg(COMPILED WITH) %{cxx} %s %{flags} %{compile_flags} %{benchmark_flags} %{link_flags} -o %t.exe",
             ]
             if "enable-benchmarks=run" in test.config.available_features:
-                steps += [
-                    "%dbg(EXECUTED AS) %{exec} %t.exe --benchmark_out=%{temp}/benchmark-result.json --benchmark_out_format=json"
-                ]
-                parse_results = os.path.join(
-                    LIBCXX_UTILS, "parse-google-benchmark-results"
-                )
-                steps += [
-                    f"{parse_results} %{temp}/benchmark-result.json --output-format=lnt > %{temp}/results.lnt"
-                ]
+                steps += ["%dbg(EXECUTED AS) %{exec} %t.exe --benchmark_out=%{temp}/benchmark-result.json --benchmark_out_format=json"]
+                parse_results = os.path.join(LIBCXX_UTILS, 'parse-google-benchmark-results')
+                steps += [f"{parse_results} %{temp}/benchmark-result.json --output-format=lnt > %{temp}/results.lnt"]
             return self._executeShTest(test, litConfig, steps)
         elif re.search('[.]gen[.][^.]+$', filename): # This only happens when a generator test is not supported
             return self._executeShTest(test, litConfig, [])