Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
(import "ci/python-gate.libsonnet") +
(import "ci/python-bench.libsonnet") +
{
overlay: "30def35dbfc43256d57ad3b9b981d92718728e2a",
overlay: "26571215e27b3c415afb8119d38a0418c14b29c9",
specVersion: "8",
// Until buildbot issues around CI tiers are resolved, we cannot use them
// tierConfig: self.tierConfig,
Expand Down Expand Up @@ -134,18 +134,6 @@
tags :: name,
}),

// Manual interpreter variants (DSL disabled)
local manual_interpreter_env = task_spec({
environment +: {
BYTECODE_DSL_INTERPRETER: "false"
},
}),
local manual_interpreter_gate(name) = manual_interpreter_env + task_spec({
tags :: name,
}),
local manual_interpreter_bench = manual_interpreter_env + task_spec({
name_suffix +:: ["manual-interpreter"],
}),
local with_compiler = task_spec({
dynamic_imports +:: ["/compiler"],
}),
Expand Down Expand Up @@ -178,11 +166,6 @@
"python-unittest-native-debug-build": gpgate + platform_spec(no_jobs) + native_debug_build_gate("python-unittest") + platform_spec({
"linux:amd64:jdk-latest" : tier3,
}),
"python-unittest-manual-interpreter": gpgate + platform_spec(no_jobs) + manual_interpreter_gate("python-unittest") + platform_spec({
"linux:amd64:jdk-latest" : daily + t("01:00:00"),
"linux:aarch64:jdk-latest" : daily + t("01:00:00"),
"darwin:aarch64:jdk-latest" : daily + t("01:00:00"),
}),
"python-unittest-multi-context": gpgate + require(GPY_NATIVE_STANDALONE) + platform_spec(no_jobs) + platform_spec({
"linux:amd64:jdk-latest" : tier3,
"linux:aarch64:jdk-latest" : daily + t("02:00:00"),
Expand Down Expand Up @@ -218,9 +201,6 @@
"darwin:aarch64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST) + with_compiler,
"windows:amd64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST) + with_compiler,
}),
"python-junit-manual-interpreter": gpgate + platform_spec(no_jobs) + manual_interpreter_gate("python-junit") + platform_spec({
"linux:amd64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST) + with_compiler,
}),
"python-junit-maven": gpgate_maven + platform_spec(no_jobs) + platform_spec({
"linux:amd64:jdk21" : daily + t("00:30:00"),
"linux:aarch64:jdk21" : daily + t("01:00:00"),
Expand Down Expand Up @@ -259,9 +239,6 @@
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_NATIVE_STANDALONE),
"windows:amd64:jdk-latest" : tier3 + require(GPY_NATIVE_STANDALONE) + batches(2),
}),
"python-svm-unittest-manual-interpreter": gpgate + platform_spec(no_jobs) + manual_interpreter_gate("python-svm-unittest") + platform_spec({
"linux:amd64:jdk-latest" : tier2,
}),
"python-tagged-unittest": gpgate + require(GPY_NATIVE_STANDALONE) + batches(TAGGED_UNITTESTS_SPLIT) + platform_spec(no_jobs) + platform_spec({
"linux:amd64:jdk-latest" : tier2,
"linux:aarch64:jdk-latest" : tier3,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,6 @@ def run_benchmark(args):
print("### no extra module search paths specified")

if GRAALPYTHON:
print(f"### using bytecode DSL interpreter: {__graalpython__.is_bytecode_dsl_interpreter}")
print(f"### using forced uncached interpreter: {getattr(__graalpython__, 'is_forced_uncached_interpreter', False)}")

BenchRunner(bench_file, bench_args=bench_args, iterations=iterations, warmup=warmup, warmup_runs=warmup_runs, startup=startup, live_results=live_results, self_measurement=self_measurement).run()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# The Universal Permissive License (UPL), Version 1.0
Expand Down Expand Up @@ -59,13 +59,6 @@
import tomllib
import argparse
import subprocess
import sys

# We log the bytecode DSL flag only in this benchamark, because we do not want to influence
# the other benchmarks by importing the sys module. Other benchmarks will print a warning
# that bytecode DSL flag could not be verified
if getattr(getattr(sys, "implementation", None), "name", None) == "graalpy":
print(f"### using bytecode DSL interpreter: {__graalpython__.is_bytecode_dsl_interpreter}")

# Sleep a bit to shake out weakref callbacks and get more measurement samples
for i in range(30):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# The Universal Permissive License (UPL), Version 1.0
Expand Down Expand Up @@ -47,7 +47,7 @@
# Note2: we want to catch OutOfMemoryError and translate it to Python MemoryError,
# so that we can attach a precise location to it if possible, but we accept that
# under some circumstances the compiler may move the allocation out of the try-catch
# and we will catch it elsewhere (probably the catch-all in PBytecodeRootNode) and
# and we will catch it elsewhere (probably the bytecode root catch-all) and
# attach imprecise location to it. Alternative is to force the allocation using
# CompilerDirectives.ensureAllocatedHere, which would, however, prevent any virtualization,
# which is deemed a price to high to pay for a precise location of MemoryError.
Expand Down
10 changes: 2 additions & 8 deletions graalpython/com.oracle.graal.python.frozen/freeze_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import ntpath
import os
import posixpath
import shutil
import sys
from collections import namedtuple
from io import StringIO
Expand Down Expand Up @@ -646,13 +645,8 @@ def main():
STDLIB_DIR = os.path.abspath(parsed_args.python_lib)
FROZEN_MODULES_DIR = os.path.abspath(parsed_args.binary_dir)

if __graalpython__.is_bytecode_dsl_interpreter:
suffix = "bin_dsl"
assert os.path.isdir(parsed_args.binary_dir), "Frozen modules for the DSL should be built after the manual bytecode interpreter."
else:
suffix = "bin"
shutil.rmtree(parsed_args.binary_dir, ignore_errors=True)
os.makedirs(parsed_args.binary_dir)
suffix = "bin_dsl"
os.makedirs(parsed_args.binary_dir, exist_ok=True)

# create module specs
modules = list(parse_frozen_specs(suffix))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
com.oracle.graal.python.processor.ArgumentClinicProcessor
com.oracle.graal.python.processor.GenerateEnumConstantsProcessor
com.oracle.graal.python.processor.GenerateNativeDowncallsProcessor
com.oracle.graal.python.processor.CApiBuiltinsProcessor
com.oracle.graal.python.processor.SlotsProcessor

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,6 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
}
}

if (!ImageInfo.inImageCode() && Boolean.getBoolean("python.EnableBytecodeDSLInterpreter")) {
// forward the property on JVM
addRelaunchArg("--vm.Dpython.EnableBytecodeDSLInterpreter=true");
}

// According to CPython if no arguments are given, they contain an empty string.
if (programArgs.isEmpty()) {
programArgs.add("");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
Expand Down Expand Up @@ -40,14 +40,10 @@
*/
package com.oracle.graal.python.test.integration.runtime;

import static com.oracle.graal.python.test.integration.PythonTests.eval;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;

import org.graalvm.polyglot.Value;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;

import com.oracle.graal.python.test.integration.PythonTests;
Expand All @@ -71,9 +67,6 @@ public void profileYield() {

@Test
public void profileException() {
Value isBytecodeDLS = eval("__graalpython__.is_bytecode_dsl_interpreter");
// GR-71916
Assume.assumeFalse("TODO: wrong stacktrace", isBytecodeDLS.asBoolean());
String source = "import sys\n" +
"def f(frame, event, arg): print(frame, event, arg)\n" +
"sys.setprofile(f)\n" +
Expand Down
Loading
Loading