Skip to content
This repository was archived by the owner on May 29, 2024. It is now read-only.

Commit dad6955

Browse files
dougxcdougxc
committed
[GR-44609] Made JVMCI source directories conform with standard layout.
PullRequest: labsjdk-ce-17/102
2 parents 652e086 + 00c1732 commit dad6955

File tree

207 files changed

+31
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+31
-230
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ NashornProfile.txt
1818
/.settings/
1919
**/JTreport/**
2020
**/JTwork/**
21-
+/mxbuild/
21+
/mxbuild/
2222
**/.checkstyle
2323
**/.classpath
2424
**/.externalToolBuilders

‎.mx.jdk/suite.py‎

Lines changed: 10 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -19,75 +19,28 @@
1919
"outputRoot" : "build/mxbuild",
2020

2121
"projects" : {
22-
23-
# ------------- JVMCI:Service -------------
24-
25-
"jdk.vm.ci.services" : {
26-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
27-
"sourceDirs" : ["src"],
22+
"jdk.internal.vm.ci" : {
23+
"subDir" : "src",
24+
"sourceDirs" : ["share/classes"],
2825
"requiresConcealed" : {
2926
"java.base" : [
3027
"jdk.internal.misc"
3128
],
3229
},
3330
"javaCompliance" : "17+",
3431
"checkstyleVersion" : "8.36.1",
35-
"workingSets" : "API,JVMCI",
36-
},
37-
38-
# ------------- JVMCI:API -------------
39-
40-
"jdk.vm.ci.common" : {
41-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
42-
"sourceDirs" : ["src"],
43-
"dependencies" : [
44-
"jdk.vm.ci.services",
45-
],
46-
"checkstyle" : "jdk.vm.ci.services",
47-
"javaCompliance" : "17+",
48-
"workingSets" : "API,JVMCI",
49-
},
50-
51-
"jdk.vm.ci.meta" : {
52-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
53-
"sourceDirs" : ["src"],
54-
"checkstyle" : "jdk.vm.ci.services",
55-
"javaCompliance" : "17+",
56-
"workingSets" : "API,JVMCI",
57-
},
58-
59-
"jdk.vm.ci.code" : {
60-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
61-
"sourceDirs" : ["src"],
62-
"dependencies" : ["jdk.vm.ci.meta", "jdk.vm.ci.common"],
63-
"checkstyle" : "jdk.vm.ci.services",
64-
"javaCompliance" : "17+",
65-
"workingSets" : "API,JVMCI",
32+
"checkPackagePrefix" : False
6633
},
6734

6835
"jdk.vm.ci.code.test" : {
6936
"subDir" : "test/hotspot/jtreg/compiler/jvmci",
7037
"sourceDirs" : ["src"],
7138
"dependencies" : [
7239
"mx:JUNIT",
73-
"jdk.vm.ci.amd64",
74-
"jdk.vm.ci.code",
75-
"jdk.vm.ci.hotspot",
40+
"jdk.internal.vm.ci",
7641
],
77-
"checkstyle" : "jdk.vm.ci.services",
42+
"checkstyle" : "jdk.internal.vm.ci",
7843
"javaCompliance" : "17+",
79-
"workingSets" : "API,JVMCI",
80-
},
81-
82-
"jdk.vm.ci.runtime" : {
83-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
84-
"sourceDirs" : ["src"],
85-
"dependencies" : [
86-
"jdk.vm.ci.code",
87-
],
88-
"checkstyle" : "jdk.vm.ci.services",
89-
"javaCompliance" : "17+",
90-
"workingSets" : "API,JVMCI",
9144
},
9245

9346
"jdk.vm.ci.runtime.test" : {
@@ -103,49 +56,10 @@
10356
"dependencies" : [
10457
"mx:JUNIT",
10558
"TESTNG",
106-
"jdk.vm.ci.common",
107-
"jdk.vm.ci.runtime",
59+
"jdk.internal.vm.ci",
10860
],
109-
"checkstyle" : "jdk.vm.ci.services",
61+
"checkstyle" : "jdk.internal.vm.ci",
11062
"javaCompliance" : "17+",
111-
"workingSets" : "API,JVMCI",
112-
},
113-
114-
# ------------- JVMCI:HotSpot -------------
115-
116-
"jdk.vm.ci.aarch64" : {
117-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
118-
"sourceDirs" : ["src"],
119-
"dependencies" : ["jdk.vm.ci.code"],
120-
"checkstyle" : "jdk.vm.ci.services",
121-
"javaCompliance" : "17+",
122-
"workingSets" : "JVMCI,AArch64",
123-
},
124-
125-
"jdk.vm.ci.amd64" : {
126-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
127-
"sourceDirs" : ["src"],
128-
"dependencies" : ["jdk.vm.ci.code"],
129-
"checkstyle" : "jdk.vm.ci.services",
130-
"javaCompliance" : "17+",
131-
"workingSets" : "JVMCI,AMD64",
132-
},
133-
134-
"jdk.vm.ci.hotspot" : {
135-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
136-
"sourceDirs" : ["src"],
137-
"dependencies" : [
138-
"jdk.vm.ci.runtime",
139-
],
140-
"requiresConcealed" : {
141-
"java.base" : [
142-
"jdk.internal.misc",
143-
"jdk.internal.org.objectweb.asm",
144-
]
145-
},
146-
"checkstyle" : "jdk.vm.ci.services",
147-
"javaCompliance" : "17+",
148-
"workingSets" : "JVMCI",
14963
},
15064

15165
"jdk.vm.ci.hotspot.test" : {
@@ -160,57 +74,10 @@
16074
"dependencies" : [
16175
"mx:JUNIT",
16276
"TESTNG",
163-
"jdk.vm.ci.code.test",
164-
"jdk.vm.ci.hotspot",
77+
"jdk.internal.vm.ci",
16578
],
166-
"checkstyle" : "jdk.vm.ci.services",
79+
"checkstyle" : "jdk.internal.vm.ci",
16780
"javaCompliance" : "17+",
168-
"workingSets" : "API,JVMCI",
169-
},
170-
171-
"jdk.vm.ci.hotspot.aarch64" : {
172-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
173-
"sourceDirs" : ["src"],
174-
"dependencies" : [
175-
"jdk.vm.ci.aarch64",
176-
"jdk.vm.ci.hotspot",
177-
],
178-
"checkstyle" : "jdk.vm.ci.services",
179-
"javaCompliance" : "17+",
180-
"workingSets" : "JVMCI,HotSpot,AArch64",
181-
},
182-
183-
"jdk.vm.ci.hotspot.amd64" : {
184-
"subDir" : "src/jdk.internal.vm.ci/share/classes",
185-
"sourceDirs" : ["src"],
186-
"dependencies" : [
187-
"jdk.vm.ci.amd64",
188-
"jdk.vm.ci.hotspot",
189-
],
190-
"checkstyle" : "jdk.vm.ci.services",
191-
"javaCompliance" : "17+",
192-
"workingSets" : "JVMCI,HotSpot,AMD64",
19381
},
19482
},
195-
"distributions": {
196-
"JVMCI" : {
197-
# This distribution defines a module.
198-
"moduleInfo" : {
199-
"name" : "jdk.internal.vm.ci",
200-
},
201-
"subDir" : "src/",
202-
"dependencies" : [
203-
"jdk.vm.ci.aarch64",
204-
"jdk.vm.ci.amd64",
205-
"jdk.vm.ci.code",
206-
"jdk.vm.ci.common",
207-
"jdk.vm.ci.hotspot",
208-
"jdk.vm.ci.hotspot.aarch64",
209-
"jdk.vm.ci.hotspot.amd64",
210-
"jdk.vm.ci.meta",
211-
"jdk.vm.ci.runtime",
212-
"jdk.vm.ci.services",
213-
],
214-
},
215-
}
21683
}

‎make/modules/jdk.internal.vm.ci/Java.gmk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,5 @@
2626
# -parameters provides method's parameters information in class file,
2727
# JVMCI compilers make use of that information for various sanity checks.
2828
# Don't use Indy strings concatenation to have good JVMCI startup performance.
29-
# The exports are needed since JVMCI is dynamically exported (see
30-
# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
3129

3230
JAVAC_FLAGS += -parameters -XDstringConcat=inline
33-
34-
## WORKAROUND jdk.internal.vm.ci source structure issue
35-
JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
36-
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
37-
$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
38-
MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))

src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.services/.checkstyle_checks.xml renamed to src/jdk.internal.vm.ci/.checkstyle_checks.xml

Lines changed: 3 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
</module>
1515
<module name="LocalFinalVariableName"/>
1616
<module name="LocalVariableName"/>
17-
<module name="MemberName">
18-
<property name="format" value="^(([a-z][a-zA-Z0-9]*$)|(_[A-Z][a-zA-Z0-9]*_[a-z][a-zA-Z0-9]*$))"/>
19-
</module>
2017
<module name="MethodName"/>
2118
<module name="PackageName"/>
2219
<module name="ParameterName"/>
@@ -96,15 +93,6 @@
9693
<property name="severity" value="ignore"/>
9794
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
9895
</module>
99-
<module name="ModifiedControlVariable"/>
100-
<module name="MutableException">
101-
<property name="severity" value="ignore"/>
102-
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
103-
</module>
104-
<module name="ParameterAssignment">
105-
<property name="severity" value="ignore"/>
106-
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
107-
</module>
10896
<module name="RegexpSinglelineJava">
10997
<metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/>
11098
<property name="format" value="\s$"/>
@@ -120,74 +108,11 @@
120108
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/>
121109
<metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/>
122110
</module>
123-
<module name="RegexpSinglelineJava">
124-
<property name="format" value="[^\x00-\x7F]"/>
125-
<property name="message" value="Only use ASCII characters."/>
126-
</module>
127-
<module name="RegexpSinglelineJava">
128-
<property name="format" value="new (Hashtable|Vector|Stack|StringBuffer)[^\w]"/>
129-
<property name="message" value="Don't use old synchronized collection classes"/>
130-
</module>
131-
<module name="SuppressionCommentFilter">
132-
<property name="offCommentFormat" value="Checkstyle: stop constant name check"/>
133-
<property name="onCommentFormat" value="Checkstyle: resume constant name check"/>
134-
<property name="checkFormat" value="ConstantNameCheck"/>
135-
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/>
136-
</module>
137-
<module name="SuppressionCommentFilter">
138-
<property name="offCommentFormat" value="Checkstyle: stop method name check"/>
139-
<property name="onCommentFormat" value="Checkstyle: resume method name check"/>
140-
<property name="checkFormat" value="MethodName"/>
141-
<property name="checkC" value="false"/>
142-
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/>
143-
</module>
144-
<module name="SuppressionCommentFilter">
145-
<property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/>
146-
<property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/>
147-
<property name="checkFormat" value="ParameterAssignment"/>
148-
<property name="checkC" value="false"/>
149-
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/>
150-
</module>
151-
<module name="SuppressionCommentFilter">
152-
<property name="offCommentFormat" value="Checkstyle: stop final variable check"/>
153-
<property name="onCommentFormat" value="Checkstyle: resume final variable check"/>
154-
<property name="checkFormat" value="FinalLocalVariable"/>
155-
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/>
156-
</module>
157111
<module name="SuppressionCommentFilter">
158112
<property name="offCommentFormat" value="Checkstyle: stop"/>
159113
<property name="onCommentFormat" value="Checkstyle: resume"/>
160114
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks"/>
161115
</module>
162-
<module name="SuppressionCommentFilter">
163-
<property name="offCommentFormat" value="CheckStyle: stop inner assignment check"/>
164-
<property name="onCommentFormat" value="CheckStyle: resume inner assignment check"/>
165-
<property name="checkFormat" value="InnerAssignment"/>
166-
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/>
167-
</module>
168-
<module name="SuppressionCommentFilter">
169-
<property name="offCommentFormat" value="Checkstyle: stop field name check"/>
170-
<property name="onCommentFormat" value="Checkstyle: resume field name check"/>
171-
<property name="checkFormat" value="MemberName"/>
172-
<property name="checkC" value="false"/>
173-
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/>
174-
</module>
175-
<module name="SuppressionCommentFilter">
176-
<property name="offCommentFormat" value="CheckStyle: stop header check"/>
177-
<property name="onCommentFormat" value="CheckStyle: resume header check"/>
178-
<property name="checkFormat" value=".*Header"/>
179-
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable header checks"/>
180-
</module>
181-
<module name="SuppressionCommentFilter">
182-
<property name="offCommentFormat" value="CheckStyle: stop line length check"/>
183-
<property name="onCommentFormat" value="CheckStyle: resume line length check"/>
184-
<property name="checkFormat" value="LineLength"/>
185-
</module>
186-
<module name="SuppressionCommentFilter">
187-
<property name="offCommentFormat" value="CheckStyle: start generated"/>
188-
<property name="onCommentFormat" value="CheckStyle: stop generated"/>
189-
<property name="checkFormat" value=".*Name|.*LineLength|.*Header"/>
190-
</module>
191116
<module name="SuppressionCommentFilter">
192117
<property name="offCommentFormat" value="@formatter:off"/>
193118
<property name="onCommentFormat" value="@formatter:on"/>
@@ -214,6 +139,9 @@
214139
<property name="format" value="\r\n"/>
215140
<property name="message" value="illegal Windows line ending"/>
216141
</module>
142+
<module name="BeforeExecutionExclusionFileFilter">
143+
<property name="fileNamePattern" value="module\-info\.java$"/>
144+
</module>
217145
<module name="BeforeExecutionExclusionFileFilter">
218146
<!-- ARM contributed file does not conform to this config -->
219147
<property name="fileNamePattern" value="AArch64TestAssembler\.java$"/>

src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64.java renamed to src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java

File renamed without changes.

src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/AArch64Kind.java renamed to src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64Kind.java

File renamed without changes.

src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.aarch64/src/jdk/vm/ci/aarch64/package-info.java renamed to src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/package-info.java

File renamed without changes.

src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java renamed to src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java

File renamed without changes.

src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64Kind.java renamed to src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64Kind.java

File renamed without changes.

src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/package-info.java renamed to src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/package-info.java

File renamed without changes.

0 commit comments

Comments
 (0)