Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reviewed-by: redestad
- Loading branch information
Showing
5 changed files
with
451 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* Copyright (c) 2021, 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. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* 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 org.openjdk.bench.vm.fences; | ||
|
||
import org.openjdk.jmh.annotations.*; | ||
|
||
import java.lang.invoke.VarHandle; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Fork(3) | ||
@BenchmarkMode(Mode.AverageTime) | ||
@OutputTimeUnit(TimeUnit.NANOSECONDS) | ||
public class Multiple { | ||
|
||
@Benchmark | ||
public void plain() { | ||
// Do nothing | ||
} | ||
|
||
@Benchmark | ||
public void loadLoad() { | ||
VarHandle.loadLoadFence(); | ||
VarHandle.loadLoadFence(); | ||
VarHandle.loadLoadFence(); | ||
VarHandle.loadLoadFence(); | ||
} | ||
|
||
@Benchmark | ||
public void storeStore() { | ||
VarHandle.storeStoreFence(); | ||
VarHandle.storeStoreFence(); | ||
VarHandle.storeStoreFence(); | ||
VarHandle.storeStoreFence(); | ||
} | ||
|
||
@Benchmark | ||
public void acquire() { | ||
VarHandle.acquireFence(); | ||
VarHandle.acquireFence(); | ||
VarHandle.acquireFence(); | ||
VarHandle.acquireFence(); | ||
} | ||
|
||
@Benchmark | ||
public void release() { | ||
VarHandle.releaseFence(); | ||
VarHandle.releaseFence(); | ||
VarHandle.releaseFence(); | ||
VarHandle.releaseFence(); | ||
} | ||
|
||
@Benchmark | ||
public void full() { | ||
VarHandle.fullFence(); | ||
VarHandle.fullFence(); | ||
VarHandle.fullFence(); | ||
VarHandle.fullFence(); | ||
} | ||
|
||
} |
111 changes: 111 additions & 0 deletions
111
test/micro/org/openjdk/bench/vm/fences/MultipleWithLoads.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
/* | ||
* Copyright (c) 2021, 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. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* 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 org.openjdk.bench.vm.fences; | ||
|
||
import org.openjdk.jmh.annotations.*; | ||
|
||
import java.lang.invoke.VarHandle; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Fork(3) | ||
@BenchmarkMode(Mode.AverageTime) | ||
@OutputTimeUnit(TimeUnit.NANOSECONDS) | ||
@State(Scope.Thread) | ||
public class MultipleWithLoads { | ||
|
||
int x, y, z; | ||
|
||
@Benchmark | ||
public int plain() { | ||
int t1 = x + y + z; | ||
int t2 = x + y + z; | ||
int t3 = x + y + z; | ||
return t1 + t2 + t3; | ||
} | ||
|
||
@Benchmark | ||
public int loadLoad() { | ||
VarHandle.loadLoadFence(); | ||
int t1 = x + y + z; | ||
VarHandle.loadLoadFence(); | ||
int t2 = x + y + z; | ||
VarHandle.loadLoadFence(); | ||
int t3 = x + y + z; | ||
VarHandle.loadLoadFence(); | ||
return t1 + t2 + t3; | ||
} | ||
|
||
@Benchmark | ||
public int storeStore() { | ||
VarHandle.storeStoreFence(); | ||
int t1 = x + y + z; | ||
VarHandle.storeStoreFence(); | ||
int t2 = x + y + z; | ||
VarHandle.storeStoreFence(); | ||
int t3 = x + y + z; | ||
VarHandle.storeStoreFence(); | ||
return t1 + t2 + t3; | ||
} | ||
|
||
@Benchmark | ||
public int acquire() { | ||
VarHandle.acquireFence(); | ||
int t1 = x + y + z; | ||
VarHandle.acquireFence(); | ||
int t2 = x + y + z; | ||
VarHandle.acquireFence(); | ||
int t3 = x + y + z; | ||
VarHandle.acquireFence(); | ||
return t1 + t2 + t3; | ||
} | ||
|
||
@Benchmark | ||
public int release() { | ||
VarHandle.releaseFence(); | ||
int t1 = x + y + z; | ||
VarHandle.releaseFence(); | ||
int t2 = x + y + z; | ||
VarHandle.releaseFence(); | ||
int t3 = x + y + z; | ||
VarHandle.releaseFence(); | ||
return t1 + t2 + t3; | ||
} | ||
|
||
@Benchmark | ||
public int full() { | ||
VarHandle.fullFence(); | ||
int t1 = x + y + z; | ||
VarHandle.fullFence(); | ||
int t2 = x + y + z; | ||
VarHandle.fullFence(); | ||
int t3 = x + y + z; | ||
VarHandle.fullFence(); | ||
return t1 + t2 + t3; | ||
} | ||
|
||
} |
105 changes: 105 additions & 0 deletions
105
test/micro/org/openjdk/bench/vm/fences/MultipleWithStores.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
/* | ||
* Copyright (c) 2021, 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. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* 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 org.openjdk.bench.vm.fences; | ||
|
||
import org.openjdk.jmh.annotations.*; | ||
|
||
import java.lang.invoke.VarHandle; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Fork(3) | ||
@BenchmarkMode(Mode.AverageTime) | ||
@OutputTimeUnit(TimeUnit.NANOSECONDS) | ||
@State(Scope.Thread) | ||
public class MultipleWithStores { | ||
|
||
int x, y, z; | ||
|
||
@Benchmark | ||
public void plain() { | ||
x = 1; | ||
y = 1; | ||
z = 1; | ||
} | ||
|
||
@Benchmark | ||
public void loadLoad() { | ||
VarHandle.loadLoadFence(); | ||
x = 1; | ||
VarHandle.loadLoadFence(); | ||
y = 1; | ||
VarHandle.loadLoadFence(); | ||
z = 1; | ||
VarHandle.loadLoadFence(); | ||
} | ||
|
||
@Benchmark | ||
public void storeStore() { | ||
VarHandle.storeStoreFence(); | ||
x = 1; | ||
VarHandle.storeStoreFence(); | ||
y = 1; | ||
VarHandle.storeStoreFence(); | ||
z = 1; | ||
VarHandle.storeStoreFence(); | ||
} | ||
|
||
@Benchmark | ||
public void acquire() { | ||
VarHandle.releaseFence(); | ||
x = 1; | ||
VarHandle.releaseFence(); | ||
y = 1; | ||
VarHandle.releaseFence(); | ||
z = 1; | ||
VarHandle.releaseFence(); | ||
} | ||
|
||
@Benchmark | ||
public void release() { | ||
VarHandle.releaseFence(); | ||
x = 1; | ||
VarHandle.releaseFence(); | ||
y = 1; | ||
VarHandle.releaseFence(); | ||
z = 1; | ||
VarHandle.releaseFence(); | ||
} | ||
|
||
@Benchmark | ||
public void full() { | ||
VarHandle.fullFence(); | ||
x = 1; | ||
VarHandle.fullFence(); | ||
y = 1; | ||
VarHandle.fullFence(); | ||
z = 1; | ||
VarHandle.fullFence(); | ||
} | ||
|
||
} |
80 changes: 80 additions & 0 deletions
80
test/micro/org/openjdk/bench/vm/fences/SafePublishing.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
* Copyright (c) 2021, 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. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* 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 org.openjdk.bench.vm.fences; | ||
|
||
import org.openjdk.jmh.annotations.*; | ||
|
||
import java.lang.invoke.VarHandle; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
@Warmup(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Measurement(iterations = 3, time = 1, timeUnit = TimeUnit.SECONDS) | ||
@Fork(value = 3, jvmArgsAppend = {"-XX:+UseParallelGC", "-Xmx128m"}) | ||
@BenchmarkMode(Mode.AverageTime) | ||
@OutputTimeUnit(TimeUnit.NANOSECONDS) | ||
@State(Scope.Thread) | ||
public class SafePublishing { | ||
|
||
@Benchmark | ||
public Object plain() { | ||
return new Plain(); | ||
} | ||
|
||
@Benchmark | ||
public Object release() { | ||
return new Release(); | ||
} | ||
|
||
@Benchmark | ||
public Object storeStore() { | ||
return new StoreStore(); | ||
} | ||
|
||
static class Plain { | ||
int x; | ||
public Plain() { | ||
x = 1; | ||
VarHandle.releaseFence(); | ||
} | ||
} | ||
|
||
static class Release { | ||
int x; | ||
public Release() { | ||
x = 1; | ||
VarHandle.releaseFence(); | ||
} | ||
} | ||
|
||
static class StoreStore { | ||
int x; | ||
public StoreStore() { | ||
x = 1; | ||
VarHandle.storeStoreFence(); | ||
} | ||
} | ||
|
||
} |
Oops, something went wrong.
5a768f7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
5a768f7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk17u-dev
5a768f7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@shipilev the backport was successfully created on the branch shipilev-backport-5a768f75 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev: