Skip to content

Commit 67aa231

Browse files
trflynn89linusg
authored andcommitted
Remove optimized bytecode options
1 parent ae11b32 commit 67aa231

File tree

2 files changed

+0
-57
lines changed

2 files changed

+0
-57
lines changed

main.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def run_streaming_script(
7676
libjs_test262_runner: Path,
7777
test262_root: Path,
7878
use_bytecode: bool,
79-
enable_bytecode_optimizations: bool,
8079
extra_runner_options: list[str],
8180
timeout: int,
8281
memory_limit: int,
@@ -91,7 +90,6 @@ def limit_memory():
9190
command = [
9291
str(libjs_test262_runner),
9392
*(["-b"] if use_bytecode else []),
94-
*(["-e"] if enable_bytecode_optimizations else []),
9593
*extra_runner_options,
9694
"--harness-location",
9795
str((test262_root / "harness").resolve()),
@@ -116,7 +114,6 @@ def run_tests(
116114
test262_root: Path,
117115
test_file_paths: list[Path],
118116
use_bytecode: bool,
119-
enable_bytecode_optimizations: bool,
120117
extra_runner_options: list[str],
121118
timeout: int,
122119
memory_limit: int,
@@ -151,7 +148,6 @@ def add_result(
151148
libjs_test262_runner,
152149
test262_root,
153150
use_bytecode,
154-
enable_bytecode_optimizations,
155151
extra_runner_options,
156152
timeout,
157153
memory_limit,
@@ -263,7 +259,6 @@ def __init__(
263259
silent: bool = False,
264260
verbose: bool = False,
265261
use_bytecode: bool = False,
266-
enable_bytecode_optimizations: bool = False,
267262
track_per_file: bool = False,
268263
fail_only: bool = False,
269264
extra_runner_options: list[str] | None = None,
@@ -278,7 +273,6 @@ def __init__(
278273
self.silent = silent
279274
self.verbose = verbose
280275
self.use_bytecode = use_bytecode
281-
self.enable_bytecode_optimizations = enable_bytecode_optimizations
282276
self.track_per_file = track_per_file
283277
self.fail_only = fail_only
284278
self.files: list[Path] = []
@@ -407,7 +401,6 @@ def process_list(self, files: list[Path]) -> list[TestRun]:
407401
self.test262_root,
408402
files,
409403
use_bytecode=self.use_bytecode,
410-
enable_bytecode_optimizations=self.enable_bytecode_optimizations,
411404
extra_runner_options=self.extra_runner_options,
412405
timeout=self.timeout,
413406
memory_limit=self.memory_limit,
@@ -526,12 +519,6 @@ def main() -> None:
526519
action="store_true",
527520
help="Use the bytecode interpreter to run the tests",
528521
)
529-
parser.add_argument(
530-
"-e",
531-
"--enable-bytecode-optimizations",
532-
action="store_true",
533-
help="Enable the bytecode optimization passes",
534-
)
535522
parser.add_argument(
536523
"-t",
537524
"--test262-root",
@@ -633,7 +620,6 @@ def main() -> None:
633620
args.silent,
634621
args.verbose,
635622
args.use_bytecode,
636-
args.enable_bytecode_optimizations,
637623
args.per_file is not None,
638624
args.fail_only,
639625
extra_runner_options,

run_all_and_update_results.py

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ def main() -> None:
8888
metavar="PATH",
8989
help="output the per-file result of the bytecode run to this file",
9090
)
91-
parser.add_argument(
92-
"--per-file-bytecode-optimized-output",
93-
default=None,
94-
type=str,
95-
metavar="PATH",
96-
help="output the per-file result of the optimized bytecode run to this file",
97-
)
9891
args = parser.parse_args()
9992

10093
libjs_test262 = Path(__file__).parent
@@ -184,25 +177,6 @@ def main() -> None:
184177
)
185178
libjs_test262_bc_results = libjs_test262_bc_output["results"]["test"]["results"]
186179

187-
print("Running test262 with the optimized bytecode interpreter...")
188-
libjs_test262_bc_opt_output = json.loads(
189-
# This is not the way either, but I can't be bothered to fix the one above and _then_ copy it. :^)
190-
run_command(
191-
f"python3 {libjs_test262_main_py} "
192-
f"--libjs-test262-runner {libjs_test262_runner} "
193-
f"--test262 {test262} "
194-
"--silent --summary --json --use-bytecode --enable-bytecode-optimizations "
195-
+ (
196-
""
197-
if args.per_file_bytecode_optimized_output is None
198-
else f"--per-file {args.per_file_bytecode_optimized_output} "
199-
)
200-
)
201-
)
202-
libjs_test262_bc_opt_results = libjs_test262_bc_opt_output["results"]["test"][
203-
"results"
204-
]
205-
206180
result = {
207181
"commit_timestamp": commit_timestamp,
208182
"run_timestamp": run_timestamp,
@@ -243,23 +217,6 @@ def main() -> None:
243217
"todo_error": libjs_test262_bc_results["TODO_ERROR"],
244218
},
245219
},
246-
"test262-bytecode-optimized": {
247-
"duration": libjs_test262_bc_opt_output["duration"],
248-
"results": {
249-
"total": libjs_test262_bc_opt_output["results"]["test"]["count"],
250-
"passed": libjs_test262_bc_opt_results["PASSED"],
251-
"failed": libjs_test262_bc_opt_results["FAILED"],
252-
"skipped": libjs_test262_bc_opt_results["SKIPPED"],
253-
"metadata_error": libjs_test262_bc_opt_results["METADATA_ERROR"],
254-
"harness_error": libjs_test262_bc_opt_results["HARNESS_ERROR"],
255-
"timeout_error": libjs_test262_bc_opt_results["TIMEOUT_ERROR"],
256-
"process_error": libjs_test262_bc_opt_results["PROCESS_ERROR"],
257-
"runner_exception": libjs_test262_bc_opt_results[
258-
"RUNNER_EXCEPTION"
259-
],
260-
"todo_error": libjs_test262_bc_opt_results["TODO_ERROR"],
261-
},
262-
},
263220
"test262-parser-tests": {
264221
"duration": test_js_output["duration"],
265222
"results": {

0 commit comments

Comments
 (0)