Skip to content

V
V8
Commit 3b5e84ab authored by jyan's avatar jyan Committed by Commit bot
Browse files
Options

S390: Initial test changes and files checkin. 

R=danno@chromium.org,jkummerow@chromium.org,jochen@chromium.org,joransiu@ca.ibm.com,michael_dawson@ca.ibm.com,mbrandy@us.ibm.com
BUG=

Review URL: https://codereview.chromium.org/1805533002

Cr-Commit-Position: refs/heads/master@{#34795}
parent 0852060f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 795 additions and 7 deletions
test/cctest/cctest.gyp
View file @ 3b5e84ab
...@@ -236,6 +236,20 @@ ...@@ -236,6 +236,20 @@
'test-js-arm64-variables.cc' 'test-js-arm64-variables.cc'
], ],
}], }],
['v8_target_arch=="s390"', {
'sources': [ ### gcmole(arch:s390) ###
'test-assembler-s390.cc',
'test-code-stubs.cc',
'test-disasm-s390.cc'
],
}],
['v8_target_arch=="s390x"', {
'sources': [ ### gcmole(arch:s390x) ###
'test-assembler-s390.cc',
'test-code-stubs.cc',
'test-disasm-s390.cc'
],
}],
['v8_target_arch=="ppc"', { ['v8_target_arch=="ppc"', {
'sources': [ ### gcmole(arch:ppc) ### 'sources': [ ### gcmole(arch:ppc) ###
'test-assembler-ppc.cc', 'test-assembler-ppc.cc',
......
test/cctest/compiler/call-tester.h
View file @ 3b5e84ab
...@@ -220,7 +220,8 @@ class CallHelper { ...@@ -220,7 +220,8 @@ class CallHelper {
Simulator::CallArgument(p5), Simulator::CallArgument::End()}; Simulator::CallArgument(p5), Simulator::CallArgument::End()};
return CastReturnValue<R>(CallSimulator(FUNCTION_ADDR(f), args)); return CastReturnValue<R>(CallSimulator(FUNCTION_ADDR(f), args));
} }
#elif USE_SIMULATOR && (V8_TARGET_ARCH_MIPS64 || V8_TARGET_ARCH_PPC64) #elif USE_SIMULATOR && \
(V8_TARGET_ARCH_MIPS64 || V8_TARGET_ARCH_PPC64 || V8_TARGET_ARCH_S390X)
uintptr_t CallSimulator(byte* f, int64_t p1 = 0, int64_t p2 = 0, uintptr_t CallSimulator(byte* f, int64_t p1 = 0, int64_t p2 = 0,
int64_t p3 = 0, int64_t p4 = 0, int64_t p5 = 0) { int64_t p3 = 0, int64_t p4 = 0, int64_t p5 = 0) {
Simulator* simulator = Simulator::current(isolate_); Simulator* simulator = Simulator::current(isolate_);
...@@ -264,8 +265,8 @@ class CallHelper { ...@@ -264,8 +265,8 @@ class CallHelper {
ParameterTraits<P2>::Cast(p2), ParameterTraits<P3>::Cast(p3), ParameterTraits<P2>::Cast(p2), ParameterTraits<P3>::Cast(p3),
ParameterTraits<P4>::Cast(p4), ParameterTraits<P5>::Cast(p5))); ParameterTraits<P4>::Cast(p4), ParameterTraits<P5>::Cast(p5)));
} }
#elif USE_SIMULATOR && \ #elif USE_SIMULATOR && (V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS || \
(V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_PPC) V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_S390)
uintptr_t CallSimulator(byte* f, int32_t p1 = 0, int32_t p2 = 0, uintptr_t CallSimulator(byte* f, int32_t p1 = 0, int32_t p2 = 0,
int32_t p3 = 0, int32_t p4 = 0, int32_t p5 = 0) { int32_t p3 = 0, int32_t p4 = 0, int32_t p5 = 0) {
Simulator* simulator = Simulator::current(isolate_); Simulator* simulator = Simulator::current(isolate_);
......
test/cctest/test-assembler-s390.cc 0 → 100644
View file @ 3b5e84ab
This diff is collapsed.
test/cctest/test-disasm-s390.cc 0 → 100644
View file @ 3b5e84ab
This diff is collapsed.
test/cctest/test-hashing.cc
View file @ 3b5e84ab
...@@ -90,6 +90,15 @@ void generate(MacroAssembler* masm, uint32_t key) { ...@@ -90,6 +90,15 @@ void generate(MacroAssembler* masm, uint32_t key) {
__ pop(kRootRegister); __ pop(kRootRegister);
__ jr(ra); __ jr(ra);
__ nop(); __ nop();
#elif V8_TARGET_ARCH_S390
__ push(kRootRegister);
__ push(ip);
__ InitializeRootRegister();
__ lhi(r2, Operand(key));
__ GetNumberHash(r2, ip);
__ pop(ip);
__ pop(kRootRegister);
__ Ret();
#elif V8_TARGET_ARCH_PPC #elif V8_TARGET_ARCH_PPC
__ function_descriptor(); __ function_descriptor();
__ push(kRootRegister); __ push(kRootRegister);
......
test/cctest/test-lockers.cc
View file @ 3b5e84ab
...@@ -298,7 +298,7 @@ class SeparateIsolatesLocksNonexclusiveThread : public JoinableThread { ...@@ -298,7 +298,7 @@ class SeparateIsolatesLocksNonexclusiveThread : public JoinableThread {
// Run parallel threads that lock and access different isolates in parallel // Run parallel threads that lock and access different isolates in parallel
TEST(SeparateIsolatesLocksNonexclusive) { TEST(SeparateIsolatesLocksNonexclusive) {
i::FLAG_always_opt = false; i::FLAG_always_opt = false;
#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS #if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_S390
const int kNThreads = 50; const int kNThreads = 50;
#else #else
const int kNThreads = 100; const int kNThreads = 100;
...@@ -382,7 +382,7 @@ class LockerUnlockerThread : public JoinableThread { ...@@ -382,7 +382,7 @@ class LockerUnlockerThread : public JoinableThread {
// Use unlocker inside of a Locker, multiple threads. // Use unlocker inside of a Locker, multiple threads.
TEST(LockerUnlocker) { TEST(LockerUnlocker) {
i::FLAG_always_opt = false; i::FLAG_always_opt = false;
#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS #if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_S390
const int kNThreads = 50; const int kNThreads = 50;
#else #else
const int kNThreads = 100; const int kNThreads = 100;
...@@ -439,7 +439,7 @@ class LockTwiceAndUnlockThread : public JoinableThread { ...@@ -439,7 +439,7 @@ class LockTwiceAndUnlockThread : public JoinableThread {
// Use Unlocker inside two Lockers. // Use Unlocker inside two Lockers.
TEST(LockTwiceAndUnlock) { TEST(LockTwiceAndUnlock) {
i::FLAG_always_opt = false; i::FLAG_always_opt = false;
#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS #if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS || V8_TARGET_ARCH_S390
const int kNThreads = 50; const int kNThreads = 50;
#else #else
const int kNThreads = 100; const int kNThreads = 100;
...@@ -710,6 +710,8 @@ TEST(ExtensionsRegistration) { ...@@ -710,6 +710,8 @@ TEST(ExtensionsRegistration) {
const int kNThreads = 10; const int kNThreads = 10;
#elif V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_32_BIT #elif V8_TARGET_ARCH_X64 && V8_TARGET_ARCH_32_BIT
const int kNThreads = 4; const int kNThreads = 4;
#elif V8_TARGET_ARCH_S390 && V8_TARGET_ARCH_32_BIT
const int kNThreads = 10;
#else #else
const int kNThreads = 40; const int kNThreads = 40;
#endif #endif
......
test/cctest/test-platform.cc
View file @ 3b5e84ab
...@@ -24,6 +24,10 @@ void GetStackPointer(const v8::FunctionCallbackInfo<v8::Value>& args) { ...@@ -24,6 +24,10 @@ void GetStackPointer(const v8::FunctionCallbackInfo<v8::Value>& args) {
__asm__ __volatile__("sw $sp, %0" : "=g"(sp_addr)); __asm__ __volatile__("sw $sp, %0" : "=g"(sp_addr));
#elif V8_HOST_ARCH_MIPS64 #elif V8_HOST_ARCH_MIPS64
__asm__ __volatile__("sd $sp, %0" : "=g"(sp_addr)); __asm__ __volatile__("sd $sp, %0" : "=g"(sp_addr));
#elif defined(__s390x__) || defined(_ARCH_S390X)
__asm__ __volatile__("stg 15, %0" : "=g"(sp_addr));
#elif defined(__s390__) || defined(_ARCH_S390)
__asm__ __volatile__("st 15, %0" : "=g"(sp_addr));
#elif defined(__PPC64__) || defined(_ARCH_PPC64) #elif defined(__PPC64__) || defined(_ARCH_PPC64)
__asm__ __volatile__("std 1, %0" : "=g"(sp_addr)); __asm__ __volatile__("std 1, %0" : "=g"(sp_addr));
#elif defined(__PPC__) || defined(_ARCH_PPC) #elif defined(__PPC__) || defined(_ARCH_PPC)
......
test/cctest/test-regexp.cc
View file @ 3b5e84ab
...@@ -54,6 +54,11 @@ ...@@ -54,6 +54,11 @@
#include "src/arm64/macro-assembler-arm64.h" #include "src/arm64/macro-assembler-arm64.h"
#include "src/regexp/arm64/regexp-macro-assembler-arm64.h" #include "src/regexp/arm64/regexp-macro-assembler-arm64.h"
#endif #endif
#if V8_TARGET_ARCH_S390
#include "src/regexp/s390/regexp-macro-assembler-s390.h"
#include "src/s390/assembler-s390.h"
#include "src/s390/macro-assembler-s390.h"
#endif
#if V8_TARGET_ARCH_PPC #if V8_TARGET_ARCH_PPC
#include "src/ppc/assembler-ppc.h" #include "src/ppc/assembler-ppc.h"
#include "src/ppc/macro-assembler-ppc.h" #include "src/ppc/macro-assembler-ppc.h"
...@@ -744,6 +749,8 @@ typedef RegExpMacroAssemblerX64 ArchRegExpMacroAssembler; ...@@ -744,6 +749,8 @@ typedef RegExpMacroAssemblerX64 ArchRegExpMacroAssembler;
typedef RegExpMacroAssemblerARM ArchRegExpMacroAssembler; typedef RegExpMacroAssemblerARM ArchRegExpMacroAssembler;
#elif V8_TARGET_ARCH_ARM64 #elif V8_TARGET_ARCH_ARM64
typedef RegExpMacroAssemblerARM64 ArchRegExpMacroAssembler; typedef RegExpMacroAssemblerARM64 ArchRegExpMacroAssembler;
#elif V8_TARGET_ARCH_S390
typedef RegExpMacroAssemblerS390 ArchRegExpMacroAssembler;
#elif V8_TARGET_ARCH_PPC #elif V8_TARGET_ARCH_PPC
typedef RegExpMacroAssemblerPPC ArchRegExpMacroAssembler; typedef RegExpMacroAssemblerPPC ArchRegExpMacroAssembler;
#elif V8_TARGET_ARCH_MIPS #elif V8_TARGET_ARCH_MIPS
......
test/cctest/test-sampler-api.cc
View file @ 3b5e84ab
...@@ -71,6 +71,12 @@ class SimulatorHelper { ...@@ -71,6 +71,12 @@ class SimulatorHelper {
simulator_->get_register(v8::internal::Simulator::sp)); simulator_->get_register(v8::internal::Simulator::sp));
state->fp = reinterpret_cast<void*>( state->fp = reinterpret_cast<void*>(
simulator_->get_register(v8::internal::Simulator::fp)); simulator_->get_register(v8::internal::Simulator::fp));
#elif V8_TARGET_ARCH_S390 || V8_TARGET_ARCH_S390X
state->pc = reinterpret_cast<void*>(simulator_->get_pc());
state->sp = reinterpret_cast<void*>(
simulator_->get_register(v8::internal::Simulator::sp));
state->fp = reinterpret_cast<void*>(
simulator_->get_register(v8::internal::Simulator::fp));
#endif #endif
} }
......
test/mjsunit/mjsunit.status
View file @ 3b5e84ab
...@@ -715,6 +715,16 @@ ...@@ -715,6 +715,16 @@
'harmony/symbols': [SKIP], 'harmony/symbols': [SKIP],
}], # 'arch == nacl_ia32 or arch == nacl_x64' }], # 'arch == nacl_ia32 or arch == nacl_x64'
##############################################################################
['arch == s390 or arch == s390x', {
# Stack manipulations in LiveEdit is not implemented for this arch.
'debug-liveedit-check-stack': [SKIP],
'debug-liveedit-stack-padding': [SKIP],
'debug-liveedit-restart-frame': [SKIP],
'debug-liveedit-double-call': [SKIP],
}], # 'arch == s390 or arch == s390x'
############################################################################## ##############################################################################
['deopt_fuzzer == True', { ['deopt_fuzzer == True', {
......
test/unittests/compiler/s390/instruction-selector-s390-unittest.cc 0 → 100644
View file @ 3b5e84ab
// Copyright 2014 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "test/unittests/compiler/instruction-selector-unittest.h"
namespace v8 {
namespace internal {
namespace compiler {} // namespace compiler
} // namespace internal
} // namespace v8
test/unittests/unittests.gyp
View file @ 3b5e84ab
...@@ -160,6 +160,11 @@ ...@@ -160,6 +160,11 @@
'compiler/ppc/instruction-selector-ppc-unittest.cc', 'compiler/ppc/instruction-selector-ppc-unittest.cc',
], ],
}], }],
['v8_target_arch=="s390" or v8_target_arch=="s390x"', {
'sources': [ ### gcmole(arch:s390) ###
'compiler/s390/instruction-selector-s390-unittest.cc',
],
}],
['OS=="aix"', { ['OS=="aix"', {
'ldflags': [ '-Wl,-bbigtoc' ], 'ldflags': [ '-Wl,-bbigtoc' ],
}], }],
......
tools/run-deopt-fuzzer.py
View file @ 3b5e84ab
...@@ -71,6 +71,8 @@ SUPPORTED_ARCHS = ["android_arm", ...@@ -71,6 +71,8 @@ SUPPORTED_ARCHS = ["android_arm",
"ia32", "ia32",
"ppc", "ppc",
"ppc64", "ppc64",
"s390",
"s390x",
"mipsel", "mipsel",
"nacl_ia32", "nacl_ia32",
"nacl_x64", "nacl_x64",
......
tools/run-tests.py
View file @ 3b5e84ab
...@@ -175,6 +175,8 @@ SUPPORTED_ARCHS = ["android_arm", ...@@ -175,6 +175,8 @@ SUPPORTED_ARCHS = ["android_arm",
"mips64el", "mips64el",
"nacl_ia32", "nacl_ia32",
"nacl_x64", "nacl_x64",
"s390",
"s390x",
"ppc", "ppc",
"ppc64", "ppc64",
"x64", "x64",
......
tools/testrunner/local/statusfile.py
View file @ 3b5e84ab
...@@ -59,7 +59,7 @@ for var in ["debug", "release", "big", "little", ...@@ -59,7 +59,7 @@ for var in ["debug", "release", "big", "little",
"android_arm", "android_arm64", "android_ia32", "android_x87", "android_arm", "android_arm64", "android_ia32", "android_x87",
"android_x64", "arm", "arm64", "ia32", "mips", "mipsel", "mips64", "android_x64", "arm", "arm64", "ia32", "mips", "mipsel", "mips64",
"mips64el", "x64", "x87", "nacl_ia32", "nacl_x64", "ppc", "ppc64", "mips64el", "x64", "x87", "nacl_ia32", "nacl_x64", "ppc", "ppc64",
"macos", "windows", "linux", "aix"]: "s390", "s390x", "macos", "windows", "linux", "aix"]:
VARIABLES[var] = var VARIABLES[var] = var
......
tools/testrunner/local/utils.py
View file @ 3b5e84ab
...@@ -102,6 +102,8 @@ def DefaultArch(): ...@@ -102,6 +102,8 @@ def DefaultArch():
return 'ia32' return 'ia32'
elif machine == 'amd64': elif machine == 'amd64':
return 'ia32' return 'ia32'
elif machine == 's390x':
return 's390'
elif machine == 'ppc64': elif machine == 'ppc64':
return 'ppc' return 'ppc'
else: else:
......
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