Skip to content

P
Pyston
Commit 75562e57 authored by Kevin Modzelewski's avatar Kevin Modzelewski Committed by GitHub
Browse files
Options

Merge pull request #1363 from kmod/cpython_tests 

Take a pass over the CPython tests
parents 9042baf8 a2c2b89b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 291 additions and 213 deletions
CMakeLists.txt
View file @ 75562e57
......@@ -333,7 +333,7 @@ endmacro()
add_pyston_test(defaults tests --order-by-mtime -t50)
add_pyston_test(force_llvm tests -a=-n -t90)
if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
add_pyston_test(max_compilation_tier tests -a=-O -t50)
add_pyston_test(max_compilation_tier tests -a=-L -t50)
endif()
add_pyston_test(defaults cpython --exit-code-only --skip-failing -t100)
add_pyston_test(defaults integration --exit-code-only --skip-failing -t900)
......
Makefile
View file @ 75562e57
......@@ -31,8 +31,8 @@ GTEST_DIR := $(DEPS_DIR)/gtest-1.7.0
USE_DEBUG_LIBUNWIND := 0
MAX_MEM_KB := 500000
MAX_DBG_MEM_KB := 500000
MAX_MEM_KB := 1500000
MAX_DBG_MEM_KB := 1500000
TEST_THREADS := 1
......@@ -411,10 +411,10 @@ $1_unittest:
$(NINJA) -C $(CMAKE_DIR_DBG) $1_unittest $(NINJAFLAGS)
ln -sf $(CMAKE_DIR_DBG)/$1_unittest .
dbg_$1_unittests: $1_unittest
zsh -c 'ulimit -m $(MAX_MEM_KB); time $(GDB) $(GDB_CMDS) --args ./$1_unittest --gtest_break_on_failure $(ARGS)'
zsh -c 'ulimit -v $(MAX_MEM_KB); time $(GDB) $(GDB_CMDS) --args ./$1_unittest --gtest_break_on_failure $(ARGS)'
unittests:: $1_unittest
run_$1_unittests: $1_unittest
zsh -c 'ulimit -m $(MAX_MEM_KB); time ./$1_unittest $(ARGS)'
zsh -c 'ulimit -v $(MAX_MEM_KB); time ./$1_unittest $(ARGS)'
run_unittests:: run_$1_unittests
)
endef
......@@ -759,23 +759,23 @@ define make_target
$(eval \
.PHONY: test$1 check$1
check$1 test$1: $(PYTHON_EXE_DEPS) pyston$1
$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-S -k $(TESTS_DIR) $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-S -k $(TESTS_DIR) $(ARGS)
@# we pass -I to cpython tests and skip failing ones because they are sloooow otherwise
$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-S -k --exit-code-only --skip-failing -t50 $(TEST_DIR)/cpython $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -k -a=-S --exit-code-only --skip-failing -t600 $(TEST_DIR)/integration $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-n -a=-S -t50 -k $(TESTS_DIR) $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-O -a=-S -k $(TESTS_DIR) $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-S -k --exit-code-only --skip-failing -t50 $(TEST_DIR)/cpython $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -k -a=-S --exit-code-only --skip-failing -t600 $(TEST_DIR)/integration $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-n -a=-S -t50 -k $(TESTS_DIR) $(ARGS)
$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-L -a=-S -k $(TESTS_DIR) $(ARGS)
.PHONY: run$1 dbg$1
run$1: pyston$1 $$(RUN_DEPS)
PYTHONPATH=test/test_extension:$${PYTHONPATH} ./pyston$1 $$(ARGS)
dbg$1: pyston$1 $$(RUN_DEPS)
PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -m $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS)'
PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -v $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS)'
nosearch_run$1_%: %.py pyston$1 $$(RUN_DEPS)
$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -m $$(MAX_MEM_KB); time ./pyston$1 $$(ARGS) $$<'
$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -v $$(MAX_MEM_KB); time ./pyston$1 $$(ARGS) $$<'
$$(call make_search,run$1_%)
nosearch_dbg$1_%: %.py pyston$1 $$(RUN_DEPS)
$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -m $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS) $$<'
$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -v $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS) $$<'
$$(call make_search,dbg$1_%)
ifneq ($$(ENABLE_VALGRIND),0)
......@@ -905,7 +905,7 @@ opreportcg:
.PHONY: watch_% watch wdbg_%
watch_%:
@ ( ulimit -t 60; ulimit -m $(MAK_MEM_KB); \
@ ( ulimit -t 60; ulimit -v $(MAK_MEM_KB); \
TARGET=$(dir $@)$(patsubst watch_%,%,$(notdir $@)); \
clear; $(MAKE) $$TARGET $(WATCH_ARGS); true; \
while inotifywait -q -e modify -e attrib -e move -e move_self -e create -e delete -e delete_self \
......@@ -921,7 +921,7 @@ wdbg_%:
$(MAKE) $(patsubst wdbg_%,watch_dbg_%,$@) GDB_POST_CMDS="--ex quit"
.PHONY: head_%
HEAD := 40
HEAD ?= 40
HEAD_SKIP := 6
head_%:
@ bash -c "set -o pipefail; script -e -q -c '$(MAKE) $(dir $@)$(patsubst head_%,%,$(notdir $@))' /dev/null | tail -n+$(HEAD_SKIP) | head -n$(HEAD)"
......@@ -953,7 +953,7 @@ test_cpp_ll:
.PHONY: bench_exceptions
bench_exceptions:
$(CLANGPP_EXE) $(TEST_DIR)/bench_exceptions.cpp -o bench_exceptions -O3 -std=c++11
zsh -c 'ulimit -m $(MAX_MEM_KB); time ./bench_exceptions'
zsh -c 'ulimit -v $(MAX_MEM_KB); time ./bench_exceptions'
rm bench_exceptions
TEST_EXT_MODULE_NAMES := basic_test descr_test slots_test type_test api_test
......
from_cpython/CMakeLists.txt
View file @ 75562e57
# Copy any changed stdlib files to the destination:
file(GLOB_RECURSE STDLIB_SRCS Lib/*.py)
file(GLOB STDLIB_MORE_SRCS Lib/lib2to3/*.txt)
set(STDLIB_SRCS ${STDLIB_MORE_SRCS} ${STDLIB_SRCS})
file(GLOB STDLIB_MORE_SRCS Lib/email/test/data/*)
set(STDLIB_SRCS ${STDLIB_MORE_SRCS} ${STDLIB_SRCS})
file(GLOB_RECURSE STD_INCLUDES Include/*.h)
set(STDLIB_TARGETS "")
foreach(STDLIB_FILE ${STDLIB_SRCS})
......@@ -181,6 +188,7 @@ add_custom_command(OUTPUT ${STDMODULES}
DEPENDS
pyston
copy_stdlib
setup.py
Modules/_multiprocessing/multiprocessing.c
Modules/_multiprocessing/semaphore.c
Modules/_multiprocessing/socket_connection.c
......
from_cpython/Lib/_threading_local.py
View file @ 75562e57
......@@ -15,8 +15,9 @@ a thread-local object and use its attributes:
42
You can also access the local-object's dictionary:
(Pyston change: changed this to dict(mydata.__dict__) to make more portable)
>>> mydata.__dict__
>>> dict(mydata.__dict__)
{'number': 42}
>>> mydata.__dict__.setdefault('widgets', [])
[]
......
from_cpython/Lib/test/bad_coding.py
View file @ 75562e57
# -*- coding: uft-8 -*-
# skip-if: True
from_cpython/Lib/test/bad_coding2.py
View file @ 75562e57
#coding: utf8
# skip-if: True
print '我'
from_cpython/Lib/test/script_helper.py
View file @ 75562e57
......@@ -7,8 +7,7 @@ import re
import os.path
import tempfile
import subprocess
# Pyston change: we can't import this currently
# import py_compile
import py_compile
import contextlib
import shutil
try:
......
from_cpython/Lib/test/test_cfgparser.py
View file @ 75562e57
# expected: fail
import ConfigParser
import StringIO
import os
......
from_cpython/Lib/test/test_coding.py
View file @ 75562e57
# expected: fail
import test.test_support, unittest
import os
......
from_cpython/Lib/test/test_fork1.py
View file @ 75562e57
# expected: fail
"""This test checks for correct fork() behavior.
"""
......
from_cpython/Lib/test/test_future5.py
View file @ 75562e57
# expected: fail
# Check that multiple features can be enabled.
from __future__ import unicode_literals, print_function
import sys
import unittest
from . import test_support
# Pyston change: changed to absolute import
from test import test_support
class TestMultipleFeatures(unittest.TestCase):
......
from_cpython/Lib/test/test_imaplib.py
View file @ 75562e57
# expected: fail
from test import test_support as support
# If we end up with a significant number of tests that don't require
# threading, this test module should be split. Right now we skip
......@@ -11,7 +10,8 @@ import os.path
import SocketServer
import time
from test_support import reap_threads, verbose, transient_internet
# Pyston change: changed to absolute import
from test.test_support import reap_threads, verbose, transient_internet
import unittest
try:
......
from_cpython/Lib/test/test_itertools.py
View file @ 75562e57
# expected: fail
# fails because capifunc's don't have __name__ attributes,
# which causes from_cpython/Lib/fractions.py to error
import unittest
from test import test_support
from itertools import *
......@@ -140,11 +138,6 @@ class TestBasicOps(unittest.TestCase):
self.assertEqual(result, list(combinations2(values, r))) # matches second pure python version
self.assertEqual(result, list(combinations3(values, r))) # matches second pure python version
@test_support.bigaddrspacetest
def test_combinations_overflow(self):
with self.assertRaises((OverflowError, MemoryError)):
combinations("AA", 2**29)
@test_support.impl_detail("tuple reuse is specific to CPython")
def test_combinations_tuple_reuse(self):
self.assertEqual(len(set(map(id, combinations('abcde', 3)))), 1)
......@@ -216,11 +209,6 @@ class TestBasicOps(unittest.TestCase):
self.assertEqual(result, list(cwr1(values, r))) # matches first pure python version
self.assertEqual(result, list(cwr2(values, r))) # matches second pure python version
@test_support.bigaddrspacetest
def test_combinations_with_replacement_overflow(self):
with self.assertRaises((OverflowError, MemoryError)):
combinations_with_replacement("AA", 2**30)
@test_support.impl_detail("tuple reuse is specific to CPython")
def test_combinations_with_replacement_tuple_reuse(self):
cwr = combinations_with_replacement
......@@ -287,11 +275,6 @@ class TestBasicOps(unittest.TestCase):
self.assertEqual(result, list(permutations(values, None))) # test r as None
self.assertEqual(result, list(permutations(values))) # test default r
@test_support.bigaddrspacetest
def test_permutations_overflow(self):
with self.assertRaises((OverflowError, MemoryError)):
permutations("A", 2**30)
@test_support.impl_detail("tuple reuse is specific to CPython")
def test_permutations_tuple_reuse(self):
self.assertEqual(len(set(map(id, permutations('abcde', 3)))), 1)
......@@ -376,8 +359,7 @@ class TestBasicOps(unittest.TestCase):
c = count(value)
self.assertEqual(next(copy.copy(c)), value)
self.assertEqual(next(copy.deepcopy(c)), value)
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
self.assertEqual(next(pickle.loads(pickle.dumps(c, proto))), value)
self.assertEqual(next(pickle.loads(pickle.dumps(c))), value)
def test_count_with_stride(self):
self.assertEqual(zip('abc',count(2,3)), [('a', 2), ('b', 5), ('c', 8)])
......@@ -710,11 +692,6 @@ class TestBasicOps(unittest.TestCase):
args = map(iter, args)
self.assertEqual(len(list(product(*args))), expected_len)
@test_support.bigaddrspacetest
def test_product_overflow(self):
with self.assertRaises((OverflowError, MemoryError)):
product(*(['ab']*2**5), repeat=2**25)
@test_support.impl_detail("tuple reuse is specific to CPython")
def test_product_tuple_reuse(self):
self.assertEqual(len(set(map(id, product('abc', 'def')))), 1)
......@@ -722,9 +699,6 @@ class TestBasicOps(unittest.TestCase):
def test_repeat(self):
self.assertEqual(list(repeat(object='a', times=3)), ['a', 'a', 'a'])
self.assertEqual(list(repeat(object='a', times=0)), [])
self.assertEqual(list(repeat(object='a', times=-1)), [])
self.assertEqual(list(repeat(object='a', times=-2)), [])
self.assertEqual(zip(xrange(3),repeat('a')),
[(0, 'a'), (1, 'a'), (2, 'a')])
self.assertEqual(list(repeat('a', 3)), ['a', 'a', 'a'])
......@@ -741,12 +715,6 @@ class TestBasicOps(unittest.TestCase):
list(r)
self.assertEqual(repr(r), 'repeat((1+0j), 0)')
def test_repeat_with_negative_times(self):
self.assertEqual(repr(repeat('a', -1)), "repeat('a', 0)")
self.assertEqual(repr(repeat('a', -2)), "repeat('a', 0)")
self.assertEqual(repr(repeat('a', times=-1)), "repeat('a', 0)")
self.assertEqual(repr(repeat('a', times=-2)), "repeat('a', 0)")
def test_imap(self):
self.assertEqual(list(imap(operator.pow, range(3), range(1,7))),
[0**1, 1**2, 2**3])
......@@ -832,7 +800,6 @@ class TestBasicOps(unittest.TestCase):
it = islice(it, 1)
self.assertIsNotNone(wr())
list(it) # exhaust the iterator
test_support.gc_collect()
self.assertIsNone(wr())
def test_takewhile(self):
......
from_cpython/Lib/test/test_lib2to3.py
View file @ 75562e57
# expected: fail
# skip-if: not IS_OPTIMIZED
# Skipping test_parser and test_all_fixers
# because of running
from lib2to3.tests import (test_fixers, test_pytree, test_util, test_refactor,
......
from_cpython/Lib/test/test_msilib.py
View file @ 75562e57
......@@ -2,7 +2,8 @@
""" Test suite for the code in msilib """
import unittest
import os
from test_support import run_unittest, import_module
# Pyston change: changed to an absolute import due to our changed way of running the tests
from test.test_support import run_unittest, import_module
msilib = import_module('msilib')
class Test_make_id(unittest.TestCase):
......
from_cpython/Lib/test/test_multiprocessing.py
View file @ 75562e57
# skip-if: True
# - This test hangs and the tester fails to clean it up.
#
# Unit tests for the multiprocessing package
......
from_cpython/Lib/test/test_richcmp.py
View file @ 75562e57
# expected: fail
# Tests for rich comparisons
import unittest
......
from_cpython/Lib/test/test_support.py
View file @ 75562e57
# expected: fail
# skip-if: True
# - this isn't an actual test file
"""Supporting definitions for the Python regression tests."""
if __name__ != 'test.test_support':
......
from_cpython/Lib/test/test_tarfile.py
View file @ 75562e57
# expected: fail
# -*- coding: iso-8859-15 -*-
import sys
......
from_cpython/Lib/test/test_tempfile.py
View file @ 75562e57
# expected: fail
# tempfile.py unit tests.
import tempfile
import errno
......
from_cpython/Lib/test/test_thread.py
View file @ 75562e57
# expected: fail
import os
import unittest
import random
......
from_cpython/Lib/test/test_threading_local.py
View file @ 75562e57
# expected: fail
import unittest
from doctest import DocTestSuite
from test import test_support
......
from_cpython/Lib/test/test_tokenize.py
View file @ 75562e57
# expected: fail
doctests = """
Tests for the tokenize module.
......
from_cpython/Lib/test/test_xpickle.py
View file @ 75562e57
# expected: fail
# test_pickle dumps and loads pickles via pickle.py.
# test_cpickle does the same, but via the cPickle module.
# This test covers the other two cases, making pickles with one module and
......
from_cpython/Lib/test/test_zipfile.py
View file @ 75562e57
# expected: fail
# We can test part of the module without zlib.
try:
import zlib
......
from_cpython/Lib/test/tf_inherit_check.py
View file @ 75562e57
# skip-if: True
# - not a test file itself
# Helper script for test_tempfile.py. argv[2] is the number of a file
# descriptor which should _not_ be open. Check this by attempting to
# write to it -- if we succeed, something is wrong.
......
from_cpython/Python/marshal.c
View file @ 75562e57
......@@ -436,7 +436,7 @@ w_object(PyObject *v, WFILE *p)
}
else if (PyCode_Check(v)) {
// Pyston change: not implemented
assert(0 && "not implemented");
assert(0 && "Marshalling of code objects not implemented");
abort();
/*
PyCodeObject *co = (PyCodeObject *)v;
......
src/codegen/ast_interpreter.cpp
View file @ 75562e57
......@@ -452,6 +452,8 @@ Box* ASTInterpreter::executeInner(ASTInterpreter& interpreter, CFGBlock* start_b
Box* ASTInterpreter::execute(ASTInterpreter& interpreter, CFGBlock* start_block, BST_stmt* start_at) {
UNAVOIDABLE_STAT_TIMER(t0, "us_timer_in_interpreter");
RECURSIVE_BLOCK(CXX, " in function call");
return executeInnerAndSetupFrame(interpreter, start_block, start_at);
}
......
src/jit.cpp
View file @ 75562e57
......@@ -182,9 +182,11 @@ static void enableGdbSegfaultWatcher() {
}
int handleArg(char code) {
if (code == 'O')
if (code == 'O') {
Py_OptimizeFlag++;
} else if (code == 'L') {
FORCE_OPTIMIZE = true;
else if (code == 'q')
} else if (code == 'q')
GLOBAL_VERBOSITY = 0;
else if (code == 'v') {
if (GLOBAL_VERBOSITY)
......@@ -219,6 +221,8 @@ int handleArg(char code) {
USE_REGALLOC_BASIC = false;
} else if (code == 'E') {
Py_IgnoreEnvironmentFlag = 1;
} else if (code == 'B') {
Py_DontWriteBytecodeFlag++;
} else if (code == 'P') {
PAUSE_AT_ABORT = true;
} else if (code == 'F') {
......@@ -327,7 +331,7 @@ static int main(int argc, char** argv) noexcept {
// Suppress getopt errors so we can throw them ourselves
opterr = 0;
while ((code = getopt(argc, argv, "+:OqdIibpjtrTRSUvnxXEac:FuPTGm:")) != -1) {
while ((code = getopt(argc, argv, "+:OLqdIibpjtrTRSUvnxXEBac:FuPTGm:")) != -1) {
if (code == 'c') {
assert(optarg);
command = optarg;
......
src/runtime/builtin_modules/thread.cpp
View file @ 75562e57
......@@ -19,6 +19,7 @@
#include "pythread.h"
#include "capi/typeobject.h"
#include "capi/types.h"
#include "core/threading.h"
#include "core/types.h"
#include "runtime/objmodel.h"
......@@ -79,7 +80,8 @@ static void* thread_start(STOLEN(Box*) target, STOLEN(Box*) varargs, STOLEN(Box*
try {
autoDecref(runtimeCall(target, ArgPassSpec(0, 0, true, kwargs != NULL), varargs, kwargs, NULL, NULL, NULL));
} catch (ExcInfo e) {
e.printExcAndTraceback();
if (!e.matches(SystemExit))
e.printExcAndTraceback();
e.clear();
}
......@@ -198,14 +200,36 @@ Box* getIdent() {
return boxInt(pthread_self());
}
Box* stackSize() {
Py_FatalError("unimplemented");
Box* stackSize(Box* arg) {
if (arg) {
if (PyInt_Check(arg) && PyInt_AS_LONG(arg) == 0) {
Py_RETURN_NONE;
}
raiseExcHelper(ThreadError, "Changing initial stack size is not supported in Pyston");
}
return boxInt(0);
}
Box* threadCount() {
return boxInt(nb_threads);
}
static PyObject* thread_PyThread_exit_thread(PyObject* self) noexcept {
PyErr_SetNone(PyExc_SystemExit);
return NULL;
}
PyDoc_STRVAR(exit_doc, "exit()\n\
(exit_thread() is an obsolete synonym)\n\
\n\
This is synonymous to ``raise SystemExit''. It will cause the current\n\
thread to exit silently unless the exception is caught.");
static PyMethodDef thread_methods[] = {
{ "exit_thread", (PyCFunction)thread_PyThread_exit_thread, METH_NOARGS, exit_doc },
{ "exit", (PyCFunction)thread_PyThread_exit_thread, METH_NOARGS, exit_doc },
};
void setupThread() {
// Hacky: we want to use some of CPython's implementation of the thread module (the threading local stuff),
// and some of ours (thread handling). Start off by calling a cut-down version of initthread, and then
......@@ -227,7 +251,7 @@ void setupThread() {
thread_module->giveAttr(
"get_ident", new BoxedBuiltinFunctionOrMethod(BoxedCode::create((void*)getIdent, BOXED_INT, 0, "get_ident")));
thread_module->giveAttr("stack_size", new BoxedBuiltinFunctionOrMethod(
BoxedCode::create((void*)stackSize, BOXED_INT, 0, "stack_size")));
BoxedCode::create((void*)stackSize, UNKNOWN, 1, "stack_size"), { NULL }));
thread_module->giveAttr(
"_count", new BoxedBuiltinFunctionOrMethod(BoxedCode::create((void*)threadCount, BOXED_INT, 0, "_count")));
......@@ -254,5 +278,10 @@ void setupThread() {
ThreadError = (BoxedClass*)PyErr_NewException("thread.error", NULL, NULL);
thread_module->giveAttrBorrowed("error", ThreadError);
auto thread_str = getStaticString("thread");
for (auto& md : thread_methods) {
thread_module->giveAttr(md.ml_name, new BoxedCApiFunction(&md, NULL, thread_str));
}
}
}
src/runtime/capi.cpp
View file @ 75562e57
......@@ -628,7 +628,15 @@ extern "C" PyObject* PyExceptionInstance_Class(PyObject* o) noexcept {
return PyInstance_Check(o) ? (Box*)static_cast<BoxedInstance*>(o)->inst_cls : o->cls;
}
// With optimizations turned off, we can handle much fewer Python stack frames
// in the same amount of C-stack space.
// Use NDEBUG as a proxy for whether optimizations are turned on.
#ifndef NDEBUG
#define Py_DEFAULT_RECURSION_LIMIT 300
#else
#define Py_DEFAULT_RECURSION_LIMIT 1000
#endif
static int recursion_limit = Py_DEFAULT_RECURSION_LIMIT;
extern "C" {
int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
......
src/runtime/objmodel.cpp
View file @ 75562e57
......@@ -4747,7 +4747,7 @@ Box* callFunc(BoxedFunctionBase* func, CallRewriteArgs* rewrite_args, ArgPassSpe
template <ExceptionStyle S>
static Box* callChosenCF(CompiledFunction* chosen_cf, BoxedClosure* closure, BoxedGenerator* generator, Box* globals,
Box* oarg1, Box* oarg2, Box* oarg3, Box** oargs) noexcept(S == CAPI) {
// TODO: this should be done in the rewrite as well
// TODO: this should go into the emitted code
RECURSIVE_BLOCK(S, " in function call");
if (S != chosen_cf->exception_style) {
......
src/runtime/types.cpp
View file @ 75562e57
......@@ -1631,7 +1631,9 @@ static Box* function_new(BoxedClass* cls, Box* _code, Box* globals, Box** _args)
RELEASE_ASSERT(code->source, "");
if (code->source->scoping.areGlobalsFromModule()) {
RELEASE_ASSERT(unwrapAttrWrapper(globals) == code->source->parent_module, "");
RELEASE_ASSERT(globals->cls == attrwrapper_cls && unwrapAttrWrapper(globals) == code->source->parent_module,
"Pyston doesn't support creating functions with overridden globals on code objects that weren't "
"compiled for it");
globals = NULL;
} else {
RELEASE_ASSERT(PyDict_Check(globals) || globals->cls == attrwrapper_cls, "");
......@@ -3475,10 +3477,23 @@ static int object_set_class(PyObject* self, PyObject* value, void* closure) noex
}
}
static PyObject* object_sizeof(PyObject* self, PyObject* args) noexcept {
Py_ssize_t res, isize;
res = 0;
isize = self->cls->tp_itemsize;
if (isize > 0)
res = self->cls->ob_size * isize;
res += self->cls->tp_basicsize;
return PyInt_FromSsize_t(res);
}
static PyMethodDef object_methods[] = {
{ "__reduce_ex__", object_reduce_ex, METH_VARARGS, NULL }, //
{ "__reduce__", object_reduce, METH_VARARGS, NULL }, //
{ "__format__", object_format, METH_VARARGS, PyDoc_STR("default object formatter") },
{ "__sizeof__", object_sizeof, METH_NOARGS, PyDoc_STR("__sizeof__() -> int\nsize of object in memory, in bytes") },
{ NULL, NULL, 0, NULL },
};
......
test/CPYTHON_TEST_NOTES.md
View file @ 75562e57
This diff is collapsed.
test/cpython/185test.db 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/185test.db
\ No newline at end of file
test/cpython/Sine-1000Hz-300ms.aif 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/Sine-1000Hz-300ms.aif
\ No newline at end of file
test/cpython/audiotest.au 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/audiotest.au
\ No newline at end of file
test/cpython/bad_coding.py 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/bad_coding.py
\ No newline at end of file
test/cpython/bad_coding2.py 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/bad_coding2.py
\ No newline at end of file
test/cpython/cfgparser.1 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/cfgparser.1
\ No newline at end of file
test/cpython/check_soundcard.vbs 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/check_soundcard.vbs
\ No newline at end of file
test/cpython/cjkencodings 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/cjkencodings
\ No newline at end of file
test/cpython/crashers 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/crashers
\ No newline at end of file
test/cpython/data 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/data
\ No newline at end of file
test/cpython/empty.vbs 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/empty.vbs
\ No newline at end of file
test/cpython/greyrgb.uue 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/greyrgb.uue
\ No newline at end of file
test/cpython/leakers 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/leakers
\ No newline at end of file
test/cpython/mp_fork_bomb.py 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/mp_fork_bomb.py
\ No newline at end of file
test/cpython/pickletester.py 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/pickletester.py
\ No newline at end of file
test/cpython/randv2_32.pck 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/randv2_32.pck
\ No newline at end of file
test/cpython/randv2_64.pck 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/randv2_64.pck
\ No newline at end of file
test/cpython/randv3.pck 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/randv3.pck
\ No newline at end of file
test/cpython/subprocessdata 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/subprocessdata
\ No newline at end of file
test/cpython/test_difflib_expect.html 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/test_difflib_expect.html
\ No newline at end of file
test/cpython/test_doctest.txt 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/test_doctest.txt
\ No newline at end of file
test/cpython/test_doctest2.txt 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/test_doctest2.txt
\ No newline at end of file
test/cpython/test_doctest3.txt 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/test_doctest3.txt
\ No newline at end of file
test/cpython/test_doctest4.txt 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/test_doctest4.txt
\ No newline at end of file
test/cpython/test_lib2to3_small.py 0 → 100644
View file @ 75562e57
# skip-if: IS_OPTIMIZED
# Skipping test_parser and test_all_fixers
# because of running
from lib2to3.tests import (test_fixers, test_pytree, test_util, test_refactor,
test_parser, test_main as test_main_)
import unittest
from test.test_support import run_unittest
def suite():
tests = unittest.TestSuite()
loader = unittest.TestLoader()
for m in (test_parser,):
tests.addTests(loader.loadTestsFromModule(m))
return tests
def test_main():
run_unittest(suite())
if __name__ == '__main__':
test_main()
test/cpython/testimg.uue 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/testimg.uue
\ No newline at end of file
test/cpython/testimgr.uue 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/testimgr.uue
\ No newline at end of file
test/cpython/testrgb.uue 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/testrgb.uue
\ No newline at end of file
test/cpython/testtar.tar 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/testtar.tar
\ No newline at end of file
test/cpython/tf_inherit_check.py 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/tf_inherit_check.py
\ No newline at end of file
test/cpython/tokenize_tests.txt 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/tokenize_tests.txt
\ No newline at end of file
test/cpython/tracedmodules 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/tracedmodules
\ No newline at end of file
test/cpython/zipdir.zip 0 → 120000
View file @ 75562e57
../../from_cpython/Lib/test/zipdir.zip
\ No newline at end of file
test/tests/30.py
View file @ 75562e57
# run_args: -n
# statcheck: ("-O" in EXTRA_JIT_ARGS) or (1 <= stats["num_osr_exits"] <= 2)
# statcheck: ("-L" in EXTRA_JIT_ARGS) or (1 <= stats["num_osr_exits"] <= 2)
# statcheck: noninit_count('slowpath_binop') <= 10
x = 100000
......
test/tests/arg_refs.py
View file @ 75562e57
# skip-if: '-n' in EXTRA_JIT_ARGS or '-O' in EXTRA_JIT_ARGS
# skip-if: '-n' in EXTRA_JIT_ARGS or '-L' in EXTRA_JIT_ARGS
# Tests to see if we add any extra refs to function arguments.
import sys
......
test/tests/closure_osr.py
View file @ 75562e57
# statcheck: '-O' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# statcheck: '-L' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
def f(x):
def inner():
......
test/tests/deopt_generator_tests.py
View file @ 75562e57
# skip-if: '-O' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# skip-if: '-L' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# statcheck: 4 <= noninit_count('num_deopt') < 50
# statcheck: 1 <= stats["num_osr_exits"] <= 2
......
test/tests/deopt_namescope_tests.py
View file @ 75562e57
# skip-if: '-O' in EXTRA_JIT_ARGS
# skip-if: '-L' in EXTRA_JIT_ARGS
# expected: statfail
# statcheck: 4 <= noninit_count('num_deopt') < 50
# statcheck: 1 <= stats["num_osr_exits"] <= 2
......
test/tests/deopt_tests.py
View file @ 75562e57
# skip-if: '-O' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# skip-if: '-L' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# statcheck: 4 <= noninit_count('num_deopt') < 50
# statcheck: 1 <= stats["num_osr_exits"] <= 2
......
test/tests/deopt_tests2.py
View file @ 75562e57
# skip-if: '-O' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# skip-if: '-L' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# statcheck: 4 == noninit_count('num_deopt')
# this used to hit an abort in our LLVM tier codegen
try:
......
test/tests/deopt_undefined.py
View file @ 75562e57
# skip-if: '-O' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# skip-if: '-L' in EXTRA_JIT_ARGS or '-n' in EXTRA_JIT_ARGS
# statcheck: noninit_count('num_deopt') == 2
try:
......
test/tests/listcomp_osr.py
View file @ 75562e57
# statcheck: ("-O" in EXTRA_JIT_ARGS) or (1 <= stats["num_osr_exits"] <= 2)
# statcheck: ("-L" in EXTRA_JIT_ARGS) or (1 <= stats["num_osr_exits"] <= 2)
# While perhaps not required in practice, we should have the ability to
# OSR from inside a list comprehension.
......
test/tests/osr_big.py
View file @ 75562e57
# statcheck: '-O' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# statcheck: '-L' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# "big osr" in terms of lots of live variables needing to be passed through:
......
test/tests/osr_into_failed_speculation.py
View file @ 75562e57
# statcheck: '-O' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# statcheck: '-L' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# Try to trick the JIT into OSR'ing into an optimized version with a speculation
# that has already failed.
......
test/tests/osr_maybe_undefined.py
View file @ 75562e57
# statcheck: '-O' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# statcheck: '-L' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# Regression test to make sure we can do an OSR if one of the live variables
# is potentially-undefined.
......
test/tests/osr_maybe_undefined2.py
View file @ 75562e57
# statcheck: '-O' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# statcheck: '-L' in EXTRA_JIT_ARGS or 1 <= stats['num_osr_exits'] <= 5
# Regression test to make sure we can do an OSR if one of the live variables
# is potentially-undefined.
......
test/tests/setattr_ics.py
View file @ 75562e57
# skip-if: '-n' not in EXTRA_JIT_ARGS and '-O' not in EXTRA_JIT_ARGS
# skip-if: '-n' not in EXTRA_JIT_ARGS and '-L' not in EXTRA_JIT_ARGS
# statcheck: noninit_count('slowpath_setattr') < 50
class MyDescr(object):
......
test/tests/stack_limits.py
View file @ 75562e57
# skip-if: '-n' not in EXTRA_JIT_ARGS and '-O' not in EXTRA_JIT_ARGS
# disable this test because the interpreter (with disabled bjit) currently uses too much stack
# Make sure we can recurse at least 900 times on the three different types
# of stacks that we have:
import sys
TEST_DEPTH = sys.getrecursionlimit() - 20
def recurse(n):
print n
if n > 0:
return recurse(n - 1)
return n
print "Recursing on main thread..."
recurse(900)
recurse(TEST_DEPTH)
print "Recursing in a generator..."
def gen():
yield recurse(900)
yield recurse(TEST_DEPTH)
print list(gen())
print "Recursing in a thread..."
......@@ -26,10 +25,17 @@ done = 0
def thread_target():
global done
recurse(900)
recurse(TEST_DEPTH)
done = 1
start_new_thread(thread_target, ())
while not done:
time.sleep(0.001)
s = """
if depth < TEST_DEPTH:
depth += 1
exec s
"""
exec s in {'depth': 0, 's': s, 'TEST_DEPTH': TEST_DEPTH}
test/tests/thread_forking.py
View file @ 75562e57
# skip-if: '-n' in EXTRA_JIT_ARGS or '-O' in EXTRA_JIT_ARGS
# skip-if: '-n' in EXTRA_JIT_ARGS or '-L' in EXTRA_JIT_ARGS
# Make sure that we can fork from a threaded environment
#
# Running this test with -n or -O has horrible performance, since
# Running this test with -n or -L has horrible performance, since
# we will freshly JIT all of the post-fork code after every fork.
import subprocess
......
test/tests/type_phi_test.py
View file @ 75562e57
# fail-if: '-n' not in EXTRA_JIT_ARGS and '-O' not in EXTRA_JIT_ARGS
# fail-if: '-n' not in EXTRA_JIT_ARGS and '-L' not in EXTRA_JIT_ARGS
# - This test needs type profiling to be enabled to trigger the bug
# This test throws an irgen assertion.
......
test/tests/xrange.py
View file @ 75562e57
# run_args: -n
#
# statcheck: "-O" in EXTRA_JIT_ARGS or 'slowpath_getclsattr' in stats or 'slowpath_callattr' in stats
# statcheck: "-L" in EXTRA_JIT_ARGS or 'slowpath_getclsattr' in stats or 'slowpath_callattr' in stats
# statcheck: noninit_count('slowpath_getclsattr') <= 20
# statcheck: noninit_count('slowpath_callattr') <= 22
......
tools/tester.py
View file @ 75562e57
......@@ -188,6 +188,8 @@ def get_test_options(fn, check_stats, run_memcheck):
l = l.strip()
if not l:
continue
if l.startswith("\xef\xbb\xbf"): # BOM
l = l[3:]
if not l.startswith("#"):
break
if l.startswith("# statcheck:"):
......@@ -512,6 +514,7 @@ def main(orig_dir):
global EXTMODULE_DIR_PYSTON
global EXTMODULE_DIR
global DISPLAY_SUCCESSES
global IS_OPTIMIZED
run_memcheck = False
......@@ -535,6 +538,8 @@ def main(orig_dir):
EXTMODULE_DIR = os.path.abspath(os.path.dirname(os.path.realpath(IMAGE)) + "/test/test_extension/build/lib.linux-x86_64-2.7/")
patterns = opts.pattern
IS_OPTIMIZED = int(subprocess.check_output([IMAGE, "-c", 'import sysconfig; print int("-O0" not in sysconfig.get_config_var(\"CFLAGS\"))']))
if not patterns and not TESTS_TO_SKIP:
TESTS_TO_SKIP = ["t", "t2", "t3"]
......@@ -573,7 +578,7 @@ def main(orig_dir):
filtered_tests.append(t)
tests = filtered_tests
if not tests:
print >>sys.stderr, "No tests matched the given patterns. OK by me!"
# print >>sys.stderr, "No tests matched the given patterns. OK by me!"
# this can happen legitimately in e.g. `make check_test_foo` if test_foo.py is a CPython regression test.
sys.exit(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7