From patchwork Tue Dec 3 07:14:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frobware X-Patchwork-Id: 21945 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 65E59202FA for ; Tue, 3 Dec 2013 07:14:07 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf44729391obc.3 for ; Mon, 02 Dec 2013 23:14:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :user-agent:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=SgYuqMvqQJ7+jSuP2FHcVD+GWkj/D6ft7hX7V89cAnk=; b=Jpd3KvrH5ON/GkXqrVAK6LiTJIeLzIOInTra6lWTyKB5ooQaWE1wBomRBgQacqhjZq +w6DOwQYfOF71511vDm9qnfWK6km1O5DQDrcOLsWcp9c/pw51ppnuZlOSd9ECA+GtiX4 A/VPhzbAS2VrXR3sGEUldkD5jlkGY60MBEe5Kd4BReJLfAtgy6nzTh70E2zYzq5UaEGD aKpq4pJHOAfGqXFcPtcZlvucPhlKdOX0UPlqwrCRH4JLPYFJLyYp4WLsK+0KPfpjrhJj wmGZWe2YW96vjje16LGAccjKPkiJDERiskhpQFFht5RtDSIrQjiYUfVDYIzlT24GWoX4 7FMQ== X-Gm-Message-State: ALoCoQmvdFYGf9hvOgCq4nsj1o52yw62aoYz8B/QdEsr1ntmfIXnEfcvMOrKMSbLaBRNLvyfgfbJ X-Received: by 10.182.9.36 with SMTP id w4mr17602869oba.37.1386054846270; Mon, 02 Dec 2013 23:14:06 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.38.36 with SMTP id d4ls3306656qek.7.gmail; Mon, 02 Dec 2013 23:14:06 -0800 (PST) X-Received: by 10.58.143.17 with SMTP id sa17mr56065772veb.14.1386054846113; Mon, 02 Dec 2013 23:14:06 -0800 (PST) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id ud10si30875543vcb.66.2013.12.02.23.14.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 23:14:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id ht10so9400575vcb.15 for ; Mon, 02 Dec 2013 23:14:05 -0800 (PST) X-Received: by 10.58.108.196 with SMTP id hm4mr670494veb.28.1386054845436; Mon, 02 Dec 2013 23:14:05 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp185618vcz; Mon, 2 Dec 2013 23:14:04 -0800 (PST) X-Received: by 10.180.160.212 with SMTP id xm20mr959736wib.33.1386054844389; Mon, 02 Dec 2013 23:14:04 -0800 (PST) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id r2si391054wix.40.2013.12.02.23.14.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 23:14:04 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of andrew.mcdermott@linaro.org) client-ip=74.125.82.178; Received: by mail-we0-f178.google.com with SMTP id u57so7516152wes.9 for ; Mon, 02 Dec 2013 23:14:03 -0800 (PST) X-Received: by 10.180.83.1 with SMTP id m1mr1011995wiy.9.1386054843796; Mon, 02 Dec 2013 23:14:03 -0800 (PST) Received: from localhost (host86-146-137-109.range86-146.btcentralplus.com. [86.146.137.109]) by mx.google.com with ESMTPSA id n6sm2677717wix.3.2013.12.02.23.14.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Dec 2013 23:14:03 -0800 (PST) From: Andrew McDermott To: aarch64-port-dev@openjdk.java.net Cc: patches@linaro.org Subject: RFR: merge up to jdk8-b111 Date: Tue, 03 Dec 2013 07:14:01 +0000 Message-ID: <87txeq76fa.fsf@spicy.frobware.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andrew.mcdermott@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Hi, The attached or referenced changesets merge the aarch64-port to jdk8-b111. I have built both client and server and tested as follows: Cross-compilation ================= client/fastdebug/hotspot Test results: passed: 321; failed: 10; error: 8 server/fastdebug/hotspot (*) Test results: passed: 312; failed: 21; error: 6 (*) The server/fastdebug/hotspot test used an older---Linaro OpenEmbedded 13.10---client/release as the test harness. Builtin Simulator builds ======================== server/fastdebug/hotspot Test results: passed: 216; failed: 4; error: 10 client/fastdebug/hotspot Test results: passed: 329; failed: 8; error: 11 Some of the errors are tests timing out. It appears that some tests are leaving spinning JVM processes which exacerbates the problem. I haven't looked into why this is. As inlining all the changesets would make this email quite large I have copied them to: http://people.linaro.org/~andrew.mcdermott/b111/corba-b111.patch http://people.linaro.org/~andrew.mcdermott/b111/hotspot-b111.patch http://people.linaro.org/~andrew.mcdermott/b111/jaxp-b111.patch http://people.linaro.org/~andrew.mcdermott/b111/jaxws-b111.patch http://people.linaro.org/~andrew.mcdermott/b111/jdk-b111.patch http://people.linaro.org/~andrew.mcdermott/b111/jdk8-b111.patch http://people.linaro.org/~andrew.mcdermott/b111/langtools-b111.patch http://people.linaro.org/~andrew.mcdermott/b111/nashorn-b111.patch A tarball of all the patches, including the following inline patch, may be downloaded from: http://people.linaro.org/~andrew.mcdermott/b111.tar.gz The inline changeset below represents the changes to the hotspot aarch64 specific code to bring it in line with jdk8-b111. --- cut here --- # HG changeset patch # User Andrew McDermott # Date 1385746889 0 # Node ID 631358b867dc330d3d865c9d170daccf4c4df794 # Parent 0cd6fb9aac13f79ac7b7db23235a183bcc01f655 aarch64 specific changes for merge to jdk8-b111 diff -r 0cd6fb9aac13 -r 631358b867dc src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Fri Nov 29 09:19:25 2013 +0000 +++ b/src/cpu/aarch64/vm/aarch64.ad Fri Nov 29 17:41:29 2013 +0000 @@ -1701,6 +1701,16 @@ return RegMask(); } +const RegMask Matcher::mathExactI_result_proj_mask() { + ShouldNotReachHere(); + return RegMask(); +} + +const RegMask Matcher::mathExactI_flags_proj_mask() { + ShouldNotReachHere(); + return RegMask(); +} + // helper for encoding java_to_runtime calls on sim // // this is needed to compute the extra arguments required when @@ -4465,6 +4475,8 @@ greater_equal(0xa, "ge"); less_equal(0xd, "le"); greater(0xc, "gt"); + overflow(0x6, "vs"); + no_overflow(0x7, "vc"); %} %} @@ -4482,6 +4494,8 @@ greater_equal(0x2, "hs"); less_equal(0x9, "ls"); greater(0x8, "hi"); + overflow(0x6, "vs"); + no_overflow(0x7, "vc"); %} %} diff -r 0cd6fb9aac13 -r 631358b867dc src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp --- a/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Fri Nov 29 09:19:25 2013 +0000 +++ b/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Fri Nov 29 17:41:29 2013 +0000 @@ -1415,7 +1415,7 @@ case access_field_patching_id: *cpool_addr = patch_field_offset; break; case load_mirror_patching_id: - *cpool_addr = (uint64_t)mirror(); break; + *cpool_addr = cast_from_oop(mirror()); break; case load_klass_patching_id: *cpool_addr = (uint64_t)load_klass(); break; default: diff -r 0cd6fb9aac13 -r 631358b867dc src/cpu/aarch64/vm/frame_aarch64.cpp --- a/src/cpu/aarch64/vm/frame_aarch64.cpp Fri Nov 29 09:19:25 2013 +0000 +++ b/src/cpu/aarch64/vm/frame_aarch64.cpp Fri Nov 29 17:41:29 2013 +0000 @@ -637,7 +637,7 @@ #ifdef CC_INTERP obj = istate->_oop_temp; #else - obj = (oop) at(interpreter_frame_oop_temp_offset); + obj = cast_to_oop(at(interpreter_frame_oop_temp_offset)); #endif // CC_INTERP } else { oop* obj_p = (oop*)tos_addr; diff -r 0cd6fb9aac13 -r 631358b867dc src/cpu/aarch64/vm/methodHandles_aarch64.cpp --- a/src/cpu/aarch64/vm/methodHandles_aarch64.cpp Fri Nov 29 09:19:25 2013 +0000 +++ b/src/cpu/aarch64/vm/methodHandles_aarch64.cpp Fri Nov 29 17:41:29 2013 +0000 @@ -100,6 +100,8 @@ void MethodHandles::jump_from_method_handle(MacroAssembler* _masm, Register method, Register temp, bool for_compiler_entry) { assert(method == rmethod, "interpreter calling convention"); + Label L_no_such_method; + __ cbz(rmethod, L_no_such_method); __ verify_method_ptr(method); if (!for_compiler_entry && JvmtiExport::can_post_interpreter_events()) { @@ -119,6 +121,8 @@ Method::from_interpreted_offset(); __ ldr(rscratch1,Address(method, entry_offset)); __ br(rscratch1); + __ bind(L_no_such_method); + __ b(RuntimeAddress(StubRoutines::throw_AbstractMethodError_entry())); } void MethodHandles::jump_to_lambda_form(MacroAssembler* _masm, --- cut here ---