Skip to content

Commit ac54e93

Browse files
dougxcdougxc
committed
[GR-29068] Removed SPARC sources.
PullRequest: graal/8267
2 parents c18647d + 104c8de commit ac54e93

File tree

112 files changed

+32
-14177
lines changed

Some content is hidden

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

112 files changed

+32
-14177
lines changed

‎compiler/mx.compiler/mx_compiler.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,6 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
574574
]
575575

576576
_registers = {
577-
'sparcv9': 'o0,o1,o2,o3,f8,f9,d32,d34',
578577
'amd64': 'rbx,r11,r10,r14,xmm3,xmm11,xmm14',
579578
'aarch64': 'r0,r1,r2,r3,r4,v0,v1,v2,v3'
580579
}

‎compiler/mx.compiler/mx_graal_tools.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ def hsdis(args, copyToDir=None):
115115
r'intel\hsdis-amd64-windows-%s.dll' : '6a388372cdd5fe905c1a26ced614334e405d1f30',
116116
r'intel/hsdis-amd64-linux-%s.so' : '0d031013db9a80d6c88330c42c983fbfa7053193',
117117
r'intel/hsdis-amd64-darwin-%s.dylib' : '67f6d23cbebd8998450a88b5bef362171f66f11a',
118-
r'hsdis-sparcv9-solaris-%s.so': '970640a9af0bd63641f9063c11275b371a59ee60',
119-
r'hsdis-sparcv9-linux-%s.so': '0c375986d727651dee1819308fbbc0de4927d5d9',
120118
r'hsdis-aarch64-linux-%s.so': 'fcc9b70ac91c00db8a50b0d4345490a68e3743e1',
121119
}
122120

‎compiler/mx.compiler/mx_renamegraalpackages.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,10 @@ def rename_one(filepath, old, new):
6262

6363
for proj_dir in [join(vc_dir, x) for x in os.listdir(vc_dir) if exists(join(vc_dir, x, 'mx.' + x, 'suite.py'))]:
6464
for dirpath, _, filenames in os.walk(proj_dir):
65-
if args.version >= 15 and "sparc" in dirpath:
66-
# Remove SPARC port for JDK 15
67-
shutil.rmtree(dirpath)
68-
else:
69-
for filename in filenames:
70-
if filename.endswith('.java') or filename == 'suite.py' or filename == 'generate_unicode_properties.py' or filename == "mx_substratevm.py" or "META-INF" in dirpath:
71-
filepath = join(dirpath, filename)
72-
rename_packages(filepath)
65+
for filename in filenames:
66+
if filename.endswith('.java') or filename == 'suite.py' or filename == 'generate_unicode_properties.py' or filename == "mx_substratevm.py" or "META-INF" in dirpath:
67+
filepath = join(dirpath, filename)
68+
rename_packages(filepath)
7369

7470
# move directories according to new package name
7571
for old_name, new_name in package_renamings.items():

‎compiler/mx.compiler/mx_updategraalinopenjdk.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,6 @@ def run_output(args, cwd=None):
215215
if str(mx_compiler.jdk.javaCompliance) not in p.javaCompliance:
216216
mx.log(' skipping {} since its compliance ({}) is not compatible with {}'.format(p, repr(p.javaCompliance), mx_compiler.jdk.javaCompliance))
217217
continue
218-
if args.version >= 15 and "sparc" in p.name:
219-
# Filter SPARC port for JDK 15
220-
continue
221218
if any(inc in p.name for inc in info.includes) and not any(ex in p.name for ex in info.excludes):
222219
assert len(p.source_dirs()) == 1, p
223220
version = 0
@@ -254,9 +251,6 @@ def run_output(args, cwd=None):
254251
for rel_src_file in src_files:
255252
if not len(rel_src_file):
256253
continue
257-
if args.version >= 15 and "sparc" in rel_src_file:
258-
# Skip SPARC files for JDK 15
259-
continue
260254
filename = os.path.basename(rel_src_file)
261255
src_file = join(source_dir, rel_src_file)
262256
dst_file = join(target_dir, os.path.relpath(src_file, source_dir))

‎compiler/mx.compiler/suite.py‎

Lines changed: 0 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,6 @@
147147
"sha1": "fb71a14c57a6e6f494aaaa5a84773a3e35344b9b",
148148
"urls": ["{urlbase}/hsdis-aarch64-linux-fcc9b70ac91c00db8a50b0d4345490a68e3743e1.tar.gz"],
149149
},
150-
"sparcv9": {
151-
"sha1": "1c611db3b3b89f78e1e3223fcf4d83c9a4a0dcd0",
152-
"urls": ["{urlbase}/hsdis-sparcv9-linux-0c375986d727651dee1819308fbbc0de4927d5d9.tar.gz"],
153-
},
154-
},
155-
"solaris": {
156-
"sparcv9": {
157-
"sha1": "73c911e408a0e23624020a536dd2fed680c8fd9e",
158-
"urls": ["{urlbase}/hsdis-sparcv9-solaris-970640a9af0bd63641f9063c11275b371a59ee60.tar.gz"],
159-
},
160150
},
161151
"darwin": {
162152
"amd64": {
@@ -714,20 +704,6 @@
714704
"workingSets" : "Graal,HotSpot,AMD64",
715705
},
716706

717-
"org.graalvm.compiler.hotspot.sparc" : {
718-
"subDir" : "src",
719-
"sourceDirs" : ["src"],
720-
"dependencies" : [
721-
"org.graalvm.compiler.hotspot",
722-
"org.graalvm.compiler.core.sparc",
723-
"org.graalvm.compiler.replacements.sparc",
724-
],
725-
"checkstyle" : "org.graalvm.compiler.graph",
726-
"annotationProcessors" : ["GRAAL_PROCESSOR"],
727-
"javaCompliance" : "8..14",
728-
"workingSets" : "Graal,HotSpot,SPARC",
729-
},
730-
731707
"org.graalvm.compiler.hotspot.test" : {
732708
"subDir" : "src",
733709
"sourceDirs" : ["src"],
@@ -907,29 +883,6 @@
907883
"workingSets" : "Graal,Assembler,AMD64",
908884
},
909885

910-
"org.graalvm.compiler.asm.sparc" : {
911-
"subDir" : "src",
912-
"sourceDirs" : ["src"],
913-
"dependencies" : [
914-
"org.graalvm.compiler.asm",
915-
],
916-
"checkstyle" : "org.graalvm.compiler.graph",
917-
"javaCompliance" : "8..14",
918-
"workingSets" : "Graal,Assembler,SPARC",
919-
},
920-
921-
"org.graalvm.compiler.asm.sparc.test" : {
922-
"subDir" : "src",
923-
"sourceDirs" : ["src"],
924-
"dependencies" : [
925-
"org.graalvm.compiler.asm.test",
926-
"org.graalvm.compiler.asm.sparc",
927-
],
928-
"checkstyle" : "org.graalvm.compiler.graph",
929-
"javaCompliance" : "8..14",
930-
"workingSets" : "Graal,Assembler,SPARC,Test",
931-
},
932-
933886
"org.graalvm.compiler.bytecode" : {
934887
"subDir" : "src",
935888
"sourceDirs" : ["src"],
@@ -1063,18 +1016,6 @@
10631016
"workingSets" : "Graal,LIR,AMD64",
10641017
},
10651018

1066-
"org.graalvm.compiler.lir.sparc" : {
1067-
"subDir" : "src",
1068-
"sourceDirs" : ["src"],
1069-
"dependencies" : [
1070-
"org.graalvm.compiler.asm.sparc",
1071-
"org.graalvm.compiler.lir",
1072-
],
1073-
"checkstyle" : "org.graalvm.compiler.graph",
1074-
"javaCompliance" : "8..14",
1075-
"workingSets" : "Graal,LIR,SPARC",
1076-
},
1077-
10781019
"org.graalvm.compiler.word" : {
10791020
"subDir" : "src",
10801021
"sourceDirs" : ["src"],
@@ -1132,17 +1073,6 @@
11321073
"workingSets" : "Graal,Replacements,AMD64",
11331074
},
11341075

1135-
"org.graalvm.compiler.replacements.sparc" : {
1136-
"subDir" : "src",
1137-
"sourceDirs" : ["src"],
1138-
"dependencies" : [
1139-
"org.graalvm.compiler.replacements",
1140-
],
1141-
"checkstyle" : "org.graalvm.compiler.graph",
1142-
"javaCompliance" : "8..14",
1143-
"workingSets" : "Graal,Replacements,SPARC",
1144-
},
1145-
11461076
"org.graalvm.compiler.replacements.test" : {
11471077
"subDir" : "src",
11481078
"sourceDirs" : ["src"],
@@ -1464,35 +1394,6 @@
14641394
"workingSets" : "Graal,AMD64,Test",
14651395
},
14661396

1467-
"org.graalvm.compiler.core.sparc" : {
1468-
"subDir" : "src",
1469-
"sourceDirs" : ["src"],
1470-
"dependencies" : [
1471-
"org.graalvm.compiler.core",
1472-
"org.graalvm.compiler.lir.sparc",
1473-
"org.graalvm.compiler.java"
1474-
],
1475-
"checkstyle" : "org.graalvm.compiler.graph",
1476-
"annotationProcessors" : [
1477-
"GRAAL_PROCESSOR",
1478-
],
1479-
"javaCompliance" : "8..14",
1480-
"workingSets" : "Graal,SPARC",
1481-
},
1482-
1483-
"org.graalvm.compiler.hotspot.sparc.test" : {
1484-
"subDir" : "src",
1485-
"sourceDirs" : ["src"],
1486-
"dependencies" : [
1487-
"org.graalvm.compiler.hotspot",
1488-
"org.graalvm.compiler.lir.jtt",
1489-
"JVMCI_HOTSPOT"
1490-
],
1491-
"checkstyle" : "org.graalvm.compiler.graph",
1492-
"javaCompliance" : "8..14",
1493-
"workingSets" : "Graal,SPARC,Test",
1494-
},
1495-
14961397
"org.graalvm.compiler.runtime" : {
14971398
"subDir" : "src",
14981399
"sourceDirs" : ["src"],
@@ -2083,19 +1984,6 @@
20831984
"workingSets" : "Graal,Truffle",
20841985
},
20851986

2086-
"org.graalvm.compiler.truffle.compiler.hotspot.sparc" : {
2087-
"subDir" : "src",
2088-
"sourceDirs" : ["src"],
2089-
"dependencies" : [
2090-
"org.graalvm.compiler.truffle.compiler.hotspot",
2091-
"org.graalvm.compiler.hotspot.sparc",
2092-
],
2093-
"checkstyle" : "org.graalvm.compiler.graph",
2094-
"javaCompliance" : "8..14",
2095-
"annotationProcessors" : ["GRAAL_PROCESSOR"],
2096-
"workingSets" : "Graal,Truffle,SPARC",
2097-
},
2098-
20991987
"org.graalvm.compiler.truffle.compiler.hotspot.aarch64" : {
21001988
"subDir" : "src",
21011989
"sourceDirs" : ["src"],
@@ -2160,7 +2048,6 @@
21602048
"subDir" : "src",
21612049
"dependencies" : [
21622050
"org.graalvm.compiler.api.directives.test",
2163-
"org.graalvm.compiler.asm.sparc.test",
21642051
"org.graalvm.compiler.asm.aarch64.test",
21652052
"org.graalvm.compiler.asm.amd64.test",
21662053
"org.graalvm.compiler.test",
@@ -2170,7 +2057,6 @@
21702057
"org.graalvm.compiler.hotspot.aarch64.test",
21712058
"org.graalvm.compiler.hotspot.amd64.test",
21722059
"org.graalvm.compiler.hotspot.lir.test",
2173-
"org.graalvm.compiler.hotspot.sparc.test",
21742060
"org.graalvm.compiler.hotspot.jdk15.test",
21752061
"org.graalvm.compiler.hotspot.jdk9.test",
21762062
"org.graalvm.compiler.options.test",
@@ -2226,7 +2112,6 @@
22262112
"subDir" : "src",
22272113
"dependencies" : [
22282114
"org.graalvm.compiler.truffle.compiler.hotspot.amd64",
2229-
"org.graalvm.compiler.truffle.compiler.hotspot.sparc",
22302115
"org.graalvm.compiler.truffle.compiler.hotspot.aarch64",
22312116
"org.graalvm.compiler.truffle.compiler.hotspot.libgraal",
22322117
],
@@ -2352,11 +2237,8 @@
23522237
"org.graalvm.compiler.replacements.aarch64",
23532238
"org.graalvm.compiler.core.amd64",
23542239
"org.graalvm.compiler.replacements.amd64",
2355-
"org.graalvm.compiler.core.sparc",
2356-
"org.graalvm.compiler.replacements.sparc",
23572240
"org.graalvm.compiler.hotspot.aarch64",
23582241
"org.graalvm.compiler.hotspot.amd64",
2359-
"org.graalvm.compiler.hotspot.sparc",
23602242
"org.graalvm.compiler.hotspot",
23612243
"org.graalvm.compiler.lir.aarch64",
23622244
"org.graalvm.compiler.truffle.compiler.amd64",
@@ -2365,7 +2247,6 @@
23652247
"org.graalvm.compiler.truffle.runtime.hotspot.java",
23662248
"org.graalvm.compiler.truffle.runtime.hotspot.libgraal",
23672249
"org.graalvm.compiler.truffle.compiler.hotspot.amd64",
2368-
"org.graalvm.compiler.truffle.compiler.hotspot.sparc",
23692250
"org.graalvm.compiler.truffle.compiler.hotspot.aarch64",
23702251
"org.graalvm.compiler.truffle.jfr",
23712252
],

‎compiler/src/jdk.tools.jaotc/src/jdk/tools/jaotc/CodeSectionProcessor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ void process(AOTCompiledClass compClass) {
8181
if (callInfopoint.target instanceof HotSpotForeignCallLinkage &&
8282
target.arch instanceof AMD64) {
8383
// TODO 4 is x86 size of relative displacement.
84-
// For SPARC need something different.
8584
int destOffset = infopoint.pcOffset + callInfopoint.size - 4;
8685
targetCode[destOffset + 0] = 0;
8786
targetCode[destOffset + 1] = 0;

‎compiler/src/org.graalvm.compiler.asm.sparc.test/src/org/graalvm/compiler/asm/sparc/test/BitSpecTest.java‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)