Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Automatic merge of jdk:master into master
  • Loading branch information
duke committed Nov 29, 2020
2 parents ec6c1f4 + 04eecf0 commit add594364da28933669f7c82d127047cec84e757

This file was deleted.

Large diffs are not rendered by default.

@@ -26,16 +26,10 @@
#include "precompiled.hpp"
#include "runtime/icache.hpp"

extern void aarch64TestHook();

void ICacheStubGenerator::generate_icache_flush(
ICache::flush_icache_stub_t* flush_icache_stub) {
// Give anyone who calls this a surprise
*flush_icache_stub = (ICache::flush_icache_stub_t)NULL;
}

void ICache::initialize() {
#ifdef ASSERT
aarch64TestHook();
#endif
}
void ICache::initialize() {}

Large diffs are not rendered by default.

@@ -0,0 +1,84 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

#include "precompiled.hpp"

#ifdef AARCH64

#include "asm/assembler.hpp"
#include "asm/assembler.inline.hpp"
#include "compiler/disassembler.hpp"
#include "memory/resourceArea.hpp"
#include "unittest.hpp"

#define __ _masm.

static void asm_check(const unsigned int *insns, const unsigned int *insns1, size_t len) {
bool ok = true;
for (unsigned int i = 0; i < len; i++) {
if (insns[i] != insns1[i]) {
ResourceMark rm;
stringStream ss;
ss.print_cr("Ours:");
Disassembler::decode((address)&insns1[i], (address)&insns1[i+1], &ss);
ss.print_cr("Theirs:");
Disassembler::decode((address)&insns[i], (address)&insns[i+1], &ss);

EXPECT_EQ(insns[i], insns1[i]) << ss.as_string();
}
}
}

TEST_VM(AssemblerAArch64, validate) {
// Smoke test for assembler
BufferBlob* b = BufferBlob::create("aarch64Test", 500000);
CodeBuffer code(b);
Assembler _masm(&code);
address entry = __ pc();

// python aarch64-asmtest.py | expand > asmtest.out.h
#include "asmtest.out.h"

asm_check((unsigned int *)entry, insns, sizeof insns / sizeof insns[0]);

{
address PC = __ pc();
__ ld1(v0, __ T16B, Address(r16)); // No offset
__ ld1(v0, __ T8H, __ post(r16, 16)); // Post-index
__ ld2(v0, v1, __ T8H, __ post(r24, 16 * 2)); // Post-index
__ ld1(v0, __ T16B, __ post(r16, r17)); // Register post-index
static const unsigned int vector_insns[] = {
0x4c407200, // ld1 {v0.16b}, [x16]
0x4cdf7600, // ld1 {v0.8h}, [x16], #16
0x4cdf8700, // ld2 {v0.8h, v1.8h}, [x24], #32
0x4cd17200, // ld1 {v0.16b}, [x16], x17
};
asm_check((unsigned int *)PC, vector_insns,
sizeof vector_insns / sizeof vector_insns[0]);
}

BufferBlob::free(b);
}

#endif // AARCH64
@@ -250,10 +250,7 @@ java/awt/font/TextLayout/TextLayoutBounds.java 8169188 generic-all
java/awt/font/StyledMetrics/BoldSpace.java 8198422 linux-all
java/awt/FontMetrics/FontCrash.java 8198336 windows-all
java/awt/image/BufferedImage/ICMColorDataTest/ICMColorDataTest.java 8233028 generic-all
java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java 8056077 generic-all
java/awt/image/DrawImage/IncorrectClipXorModeSW2Surface.java 8196025 windows-all
java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java 8196025 windows-all
java/awt/image/DrawImage/IncorrectSourceOffset.java 8196086 windows-all
java/awt/image/DrawImage/IncorrectAlphaSurface2SW.java 8056077 linux-all
java/awt/image/DrawImage/BlitRotateClippedArea.java 8255724 linux-all
java/awt/image/MultiResolutionImage/MultiResolutionDrawImageWithTransformTest.java 8198390 generic-all
java/awt/image/multiresolution/MultiresolutionIconTest.java 8169187 macosx-all,windows-all
@@ -47,7 +47,10 @@
* @summary Tests drawing transparent volatile image to transparent BI.
* Results of the blit compatibleImage to transparent BI used for
* comparison.
* @author Sergey Bylokhov
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectAlphaSurface2SW
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectAlphaSurface2SW
* @run main/othervm -Dsun.java2d.uiScale=3 IncorrectAlphaSurface2SW
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectAlphaSurface2SW
*/
public final class IncorrectAlphaSurface2SW {

@@ -48,7 +48,9 @@
* @bug 8061456
* @summary Tests drawing BI to volatile image using different clips + xor mode.
* Results of the blit BI to compatibleImage is used for comparison.
* @author Sergey Bylokhov
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectClipXorModeSW2Surface
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectClipXorModeSW2Surface
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectClipXorModeSW2Surface
*/
public final class IncorrectClipXorModeSW2Surface {

@@ -45,6 +45,9 @@
* @summary Tests drawing volatile image to volatile image using different
* clips + xor mode. Results of the blit compatibleImage to
* compatibleImage is used for comparison.
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectClipXorModeSurface2Surface
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectClipXorModeSurface2Surface
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectClipXorModeSurface2Surface
*/
public final class IncorrectClipXorModeSurface2Surface {

@@ -39,7 +39,10 @@
* @key headful
* @bug 8041129
* @summary Tests asymmetric source offsets.
* @author Sergey Bylokhov
* @run main/othervm -Dsun.java2d.uiScale=1 IncorrectSourceOffset
* @run main/othervm -Dsun.java2d.uiScale=2 IncorrectSourceOffset
* @run main/othervm -Dsun.java2d.uiScale=3 IncorrectSourceOffset
* @run main/othervm -Dsun.java2d.uiScale=4 IncorrectSourceOffset
*/
public final class IncorrectSourceOffset {

0 comments on commit add5943

Please sign in to comment.