stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8244675: assert(IncrementalInline || (_late_inlines.length() == 0 && !has_mh_late_inlines()))

Browse Source 
Reviewed-by: dlong
This commit is contained in:
Vladimir Ivanov 2021-09-03 12:05:00 +00:00
parent d05494f98b
commit 28ba78e647
3 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/opto/callGenerator.cpp
View File

@ -459,7 +459,9 @@ class LateInlineVirtualCallGenerator : public VirtualCallGenerator {
public:
LateInlineVirtualCallGenerator(ciMethod* method, int vtable_index, float prof_factor)
: VirtualCallGenerator(method, vtable_index, true /*separate_io_projs*/),
_unique_id(0), _inline_cg(NULL), _callee(NULL), _is_pure_call(false), _prof_factor(prof_factor) {}
_unique_id(0), _inline_cg(NULL), _callee(NULL), _is_pure_call(false), _prof_factor(prof_factor) {
assert(IncrementalInlineVirtual, "required");
}
virtual bool is_late_inline() const { return true; }

2
src/hotspot/share/opto/doCall.cpp
View File

@ -136,7 +136,7 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool
if (cg->does_virtual_dispatch()) {
cg_intrinsic = cg;
cg = NULL;
} else if (should_delay_vector_inlining(callee, jvms)) {
} else if (IncrementalInline && should_delay_vector_inlining(callee, jvms)) {
return CallGenerator::for_late_inline(callee, cg);
} else {
return cg;

49
test/hotspot/jtreg/compiler/vectorapi/TestNoInline.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. 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.
*/
package compiler.vectorapi;
import jdk.incubator.vector.IntVector;
import jdk.incubator.vector.VectorSpecies;
/*
* @test
* @bug 8244675
* @modules jdk.incubator.vector
*
* @run main/othervm -Xbatch -XX:-Inline compiler.vectorapi.TestNoInline
* @run main/othervm -Xbatch -XX:-IncrementalInline compiler.vectorapi.TestNoInline
*/
public class TestNoInline {
static final VectorSpecies<Integer> I_SPECIES = IntVector.SPECIES_PREFERRED;
static IntVector test(int[] arr) {
return IntVector.fromArray(I_SPECIES, arr, 0);
}
public static void main(String[] args) {
int[] arr = new int[64];
for (int i = 0; i < 20_000; i++) {
test(arr);
}
}
}