Skip to content

Commit

Permalink
Merge branch 'main' into init_dec
Browse files Browse the repository at this point in the history
  • Loading branch information
OfekShilon committed May 3, 2024
2 parents 08395d9 + abe4abd commit 26b1274
Show file tree
Hide file tree
Showing 17 changed files with 408 additions and 240 deletions.
2 changes: 2 additions & 0 deletions etc/config/android-java.amazon.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ compiler.java-dex2oat-latest.exe=/opt/compiler-explorer/dex2oat-latest/x86_64/bi
compiler.java-dex2oat-latest.objdumper=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/oatdump
compiler.java-dex2oat-latest.d8Id=java-d8-8242
compiler.java-dex2oat-latest.isNightly=true
compiler.java-dex2oat-latest.profmanPath=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/profman

compiler.java-dex2oat-3411.name=ART dex2oat aml_art_341110060 (Nov 2023)
compiler.java-dex2oat-3411.artArtifactDir=/opt/compiler-explorer/dex2oat-34.11
compiler.java-dex2oat-3411.exe=/opt/compiler-explorer/dex2oat-34.11/x86_64/bin/dex2oat64
compiler.java-dex2oat-3411.objdumper=/opt/compiler-explorer/dex2oat-34.11/x86_64/bin/oatdump
compiler.java-dex2oat-3411.d8Id=java-d8-8242
compiler.java-dex2oat-3411.profmanPath=/opt/compiler-explorer/dex2oat-34.11/x86_64/bin/profman

defaultCompiler=java-dex2oat-latest
1 change: 1 addition & 0 deletions etc/config/android-java.defaults.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ compiler.android-java-dex2oat-default.compilerType=dex2oat
compiler.android-java-dex2oat-default.artArtifactDir=/usr/bin/dex2oat
compiler.android-java-dex2oat-default.exe=/usr/bin/dex2oat/x86_64/bin/dex2oat64
compiler.android-java-dex2oat-default.objdumper=/usr/bin/dex2oat/x86_64/bin/oatdump
compiler.android-java-dex2oat-default.profmanPath=/usr/bin/dex2oat/x86_64/bin/profman

# This should reflect the ID and exe for android-java-d8-default.
compiler.android-java-dex2oat-default.d8Id=android-java-d8-default
Expand Down
2 changes: 2 additions & 0 deletions etc/config/android-kotlin.amazon.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ compiler.kotlin-dex2oat-latest.exe=/opt/compiler-explorer/dex2oat-latest/x86_64/
compiler.kotlin-dex2oat-latest.objdumper=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/oatdump
compiler.kotlin-dex2oat-latest.d8Id=kotlin-d8-8242
compiler.kotlin-dex2oat-latest.isNightly=true
compiler.kotlin-dex2oat-latest.profmanPath=/opt/compiler-explorer/dex2oat-latest/x86_64/bin/profman

compiler.kotlin-dex2oat-3411.name=ART dex2oat aml_art_341110060 (Nov 2023)
compiler.kotlin-dex2oat-3411.artArtifactDir=/opt/compiler-explorer/dex2oat-34.11
compiler.kotlin-dex2oat-3411.exe=/opt/compiler-explorer/dex2oat-34.11/x86_64/bin/dex2oat64
compiler.kotlin-dex2oat-3411.objdumper=/opt/compiler-explorer/dex2oat-34.11/x86_64/bin/oatdump
compiler.kotlin-dex2oat-3411.d8Id=kotlin-d8-8242
compiler.kotlin-dex2oat-3411.profmanPath=/opt/compiler-explorer/dex2oat-34.11/x86_64/bin/profman

defaultCompiler=kotlin-dex2oat-latest
1 change: 1 addition & 0 deletions etc/config/android-kotlin.defaults.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ compiler.android-kotlin-dex2oat-default.compilerType=dex2oat
compiler.android-kotlin-dex2oat-default.artArtifactDir=/usr/bin/dex2oat
compiler.android-kotlin-dex2oat-default.exe=/usr/bin/dex2oat/x86_64/bin/dex2oat64
compiler.android-kotlin-dex2oat-default.objdumper=/usr/bin/dex2oat/x86_64/bin/oatdump
compiler.android-kotlin-dex2oat-default.profmanPath=/usr/bin/dex2oat/x86_64/bin/profman

# This should reflect the ID and exe for android-kotlin-d8-default.
compiler.android-kotlin-dex2oat-default.d8Id=android-kotlin-d8-default
Expand Down
31 changes: 29 additions & 2 deletions etc/config/c++.amazon.properties
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,9 @@ compiler.clang-rocm-50700.ldPath=${exePath}/../lib|${exePath}/../lib/x86_64-unkn

################################
# Clang for Arm
# Provides 32- menu items for clang-9, clang-10 and trunk
# Provides 32-bit menu items for release versions and trunk
group.armclang32.groupName=Arm 32-bit clang
group.armclang32.compilers=armv7-clang900:armv7-clang901:armv7-clang1000:armv7-clang1001:armv7-clang1100:armv7-clang1101:armv7-clang-trunk
group.armclang32.compilers=armv7-clang900:armv7-clang901:armv7-clang1000:armv7-clang1001:armv7-clang1100:armv7-clang1101:armv7-clang1200:armv7-clang1201:armv7-clang1300:armv7-clang1301:armv7-clang1400:armv7-clang1500:armv7-clang1600:armv7-clang1701:armv7-clang1810:armv7-clang-trunk
group.armclang32.isSemVer=true
group.armclang32.compilerType=clang
group.armclang32.supportsExecute=false
Expand All @@ -643,6 +643,33 @@ group.armclang32.licenseLink=https://github.com/llvm/llvm-project/blob/main/LICE
group.armclang32.licensePreamble=The LLVM Project is under the Apache License v2.0 with LLVM Exceptions
group.armclang32.compilerCategories=clang

compiler.armv7-clang1810.exe=/opt/compiler-explorer/clang-18.1.0/bin/clang++
compiler.armv7-clang1810.semver=18.1.0
compiler.armv7-clang1810.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-13.2.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-13.2.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1701.exe=/opt/compiler-explorer/clang-17.0.1/bin/clang++
compiler.armv7-clang1701.semver=17.0.1
compiler.armv7-clang1701.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-13.2.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-13.2.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1600.exe=/opt/compiler-explorer/clang-16.0.0/bin/clang++
compiler.armv7-clang1600.semver=16.0.0
compiler.armv7-clang1600.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-12.2.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-12.2.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1500.exe=/opt/compiler-explorer/clang-15.0.0/bin/clang++
compiler.armv7-clang1500.semver=15.0.0
compiler.armv7-clang1500.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-12.2.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-12.2.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1400.exe=/opt/compiler-explorer/clang-14.0.0/bin/clang++
compiler.armv7-clang1400.semver=14.0.0
compiler.armv7-clang1400.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-11.2.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-11.2.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1301.exe=/opt/compiler-explorer/clang-13.0.1/bin/clang++
compiler.armv7-clang1301.semver=13.0.1
compiler.armv7-clang1301.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-11.2.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-11.2.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1300.exe=/opt/compiler-explorer/clang-13.0.0/bin/clang++
compiler.armv7-clang1300.semver=13.0.0
compiler.armv7-clang1300.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-11.2.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-11.2.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1201.exe=/opt/compiler-explorer/clang-12.0.1/bin/clang++
compiler.armv7-clang1201.semver=12.0.1
compiler.armv7-clang1201.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-11.1.0/arm-unknown-linux-gnueabihf --sysroot=/opt/compiler-explorer/arm/gcc-11.1.0/arm-unknown-linux-gnueabihf/arm-unknown-linux-gnueabihf/sysroot
compiler.armv7-clang1200.exe=/opt/compiler-explorer/clang-12.0.0/bin/clang++
compiler.armv7-clang1200.semver=12.0.0
compiler.armv7-clang1200.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-10.3.0/arm-unknown-linux-gnueabi --sysroot=/opt/compiler-explorer/arm/gcc-10.3.0/arm-unknown-linux-gnueabi/arm-unknown-linux-gnueabi/sysroot
compiler.armv7-clang1101.exe=/opt/compiler-explorer/clang-11.0.1/bin/clang++
compiler.armv7-clang1101.semver=11.0.1
compiler.armv7-clang1101.options=-target arm-linux-gnueabi --gcc-toolchain=/opt/compiler-explorer/arm/gcc-8.2.0/arm-unknown-linux-gnueabi --sysroot=/opt/compiler-explorer/arm/gcc-8.2.0/arm-unknown-linux-gnueabi/arm-unknown-linux-gnueabi/sysroot
Expand Down
14 changes: 11 additions & 3 deletions etc/config/rust.amazon.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
compilers=&rust:&rustgcc:&mrustc:&rustccggcc
objdumper=/opt/compiler-explorer/gcc-13.2.0/bin/objdump
linker=/opt/compiler-explorer/gcc-13.2.0/bin/gcc
defaultCompiler=r1770
defaultCompiler=r1780
demangler=/opt/compiler-explorer/gcc-13.2.0/bin/c++filt
demanglerArgs=--format=rust

buildenvsetup=ceconan-rust
buildenvsetup.host=https://conan.compiler-explorer.com

group.rust.compilers=r1770:r1760:r1750:r1740:r1730:r1720:r1710:r1700:r1690:r1680:r1670:r1660:r1650:r1640:r1630:r1620:r1610:r1600:r1590:r1580:r1570:r1560:r1550:r1540:r1530:r1520:r1510:r1500:r1490:r1480:r1470:r1460:r1452:r1450:r1440:r1430:r1420:r1410:r1400:r1390:r1380:r1370:r1360:r1350:r1340:r1330:r1320:r1310:r1300:r1290:r1280:r1271:r1270:r1260:r1250:r1240:r1230:r1220:r1210:r1200:r1190:r1180:r1170:r1160:r1151:r1140:r1130:r1120:r1110:r1100:r190:r180:r170:r160:r150:r140:r130:r120:r110:r100:nightly:beta
group.rust.compilers=r1780:r1770:r1760:r1750:r1740:r1730:r1720:r1710:r1700:r1690:r1680:r1670:r1660:r1650:r1640:r1630:r1620:r1610:r1600:r1590:r1580:r1570:r1560:r1550:r1540:r1530:r1520:r1510:r1500:r1490:r1480:r1470:r1460:r1452:r1450:r1440:r1430:r1420:r1410:r1400:r1390:r1380:r1370:r1360:r1350:r1340:r1330:r1320:r1310:r1300:r1290:r1280:r1271:r1270:r1260:r1250:r1240:r1230:r1220:r1210:r1200:r1190:r1180:r1170:r1160:r1151:r1140:r1130:r1120:r1110:r1100:r190:r180:r170:r160:r150:r140:r130:r120:r110:r100:nightly:beta
group.rust.compilerType=rust
group.rust.isSemVer=true
group.rust.unwiseOptions=-Ctarget-cpu=native|target-cpu=native
Expand All @@ -18,6 +18,8 @@ group.rust.licenseName=Dual-licensed under Apache 2.0 and MIT terms
group.rust.licensePreamble=Rust is licensed under the Apache License, Version 2.0 or the MIT license
group.rust.supportsBinary=true
group.rust.supportsBinaryObject=true
compiler.r1780.exe=/opt/compiler-explorer/rust-1.78.0/bin/rustc
compiler.r1780.semver=1.78.0
compiler.r1770.exe=/opt/compiler-explorer/rust-1.77.0/bin/rustc
compiler.r1770.semver=1.77.0
compiler.r1760.exe=/opt/compiler-explorer/rust-1.76.0/bin/rustc
Expand Down Expand Up @@ -252,7 +254,7 @@ compiler.mrustc-master.isNightly=true
#################################
# Installed libs, generated from ce_install generate-rust-crates
# Don't modify directly
libs=aho-corasick:ansi_term:anyhow:arrayvec:atty:autocfg:backtrace:base64:bitflags:block-buffer:byteorder:bytes:cc:cfg-if:chrono:clap:color-eyre:contracts:crossbeam-channel:crossbeam-deque:crossbeam-epoch:crossbeam-utils:dashmap:digest:either:env_logger:eyre:fnv:futures:futures-channel:futures-core:futures-task:futures-util:generic-array:getrandom:h2:hashbrown:heck:http:httparse:hyper:idna:indexmap:itertools:itoa:lazy_static:libc:lock_api:log:matches:memchr:memoffset:miniz_oxide:mio:ndarray:num:num-integer:num-traits:num_cpus:num_traits:once_cell:opaque-debug:parking_lot:parking_lot_core:percent-encoding:phf:pin-project-lite:pkg-config:ppv-lite86:proc-macro-hack:proc-macro2:quote:rand:rand_chacha:rand_core:rayon:regex:regex-syntax:rustc_version:ryu:scopeguard:semver:semver-parser:serde:serde_derive:serde_json:slab:smallvec:socket2:strsim:subtle:syn:termcolor:textwrap:thiserror:thiserror-impl:thread_local:time:tokio:toml:typenum:unicode-bidi:unicode-normalization:unicode-segmentation:unicode-width:unicode-xid:url:vec_map:version_check:wide:winapi:zerocopy
libs=aho-corasick:ansi_term:anyhow:arrayvec:atty:autocfg:backtrace:base64:bincode:bitflags:block-buffer:byteorder:bytes:cc:cfg-if:chrono:clap:color-eyre:contracts:crossbeam-channel:crossbeam-deque:crossbeam-epoch:crossbeam-utils:dashmap:digest:either:env_logger:eyre:fnv:futures:futures-channel:futures-core:futures-task:futures-util:generic-array:getrandom:h2:hashbrown:heck:http:httparse:hyper:idna:indexmap:itertools:itoa:lazy_static:libc:lock_api:log:matches:memchr:memoffset:miniz_oxide:mio:ndarray:num:num-integer:num-traits:num_cpus:num_traits:once_cell:opaque-debug:parking_lot:parking_lot_core:percent-encoding:phf:pin-project-lite:pkg-config:ppv-lite86:proc-macro-hack:proc-macro2:quote:rand:rand_chacha:rand_core:rayon:regex:regex-syntax:rustc_version:ryu:scopeguard:semver:semver-parser:serde:serde_derive:serde_json:slab:smallvec:socket2:strsim:subtle:syn:termcolor:textwrap:thiserror:thiserror-impl:thread_local:time:tokio:toml:typenum:unicode-bidi:unicode-normalization:unicode-segmentation:unicode-width:unicode-xid:url:vec_map:version_check:wide:winapi:zerocopy

libs.aho-corasick.name=aho-corasick
libs.aho-corasick.url=https://crates.io/crates/aho-corasick
Expand Down Expand Up @@ -302,6 +304,12 @@ libs.base64.versions=0130
libs.base64.versions.0130.version=0.13.0
libs.base64.versions.0130.path=libbase64.rlib

libs.bincode.name=bincode
libs.bincode.url=https://crates.io/crates/bincode
libs.bincode.versions=133
libs.bincode.versions.133.version=1.3.3
libs.bincode.versions.133.path=libbincode.rlib

libs.bitflags.name=bitflags
libs.bitflags.url=https://crates.io/crates/bitflags
libs.bitflags.versions=132
Expand Down
6 changes: 4 additions & 2 deletions etc/config/spice.amazon.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
compilers=&spice
defaultCompiler=spice01905
defaultCompiler=spice01906

group.spice.compilers=spice01902:spice01903:spice01904:spice01905
group.spice.compilers=spice01902:spice01903:spice01904:spice01905:spice01906
group.spice.demangler=/opt/compiler-explorer/gcc-13.2.0/bin/c++filt
group.spice.objdumper=/opt/compiler-explorer/gcc-13.2.0/bin/objdump
group.spice.isSemVer=true
Expand All @@ -23,6 +23,8 @@ compiler.spice01904.exe=/opt/compiler-explorer/spice-0.19.4/spice
compiler.spice01904.semver=0.19.4
compiler.spice01905.exe=/opt/compiler-explorer/spice-0.19.5/spice
compiler.spice01905.semver=0.19.5
compiler.spice01906.exe=/opt/compiler-explorer/spice-0.19.6/spice
compiler.spice01906.semver=0.19.6

#################################
#################################
Expand Down
9 changes: 9 additions & 0 deletions examples/android-java/default.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,12 @@ static int square(int num) {
}
}

// Set `enabled` to `true` to enable profile-guided compilation for dex2oat.
// For the profile format, see
// https://developer.android.com/topic/performance/baselineprofiles/manually-create-measure#define-rules-manually
// (For advanced use only!)
/* ---------- begin profile (enabled=false) ----------
HSPLSquare;-><init>()V
HSPLSquare;->square(I)I
LSquare;
---------- end profile ---------- */
9 changes: 9 additions & 0 deletions examples/android-kotlin/default.kt
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
// Type your code here, or load an example.
fun square(num: Int): Int = num * num

// Set `enabled` to `true` to enable profile-guided compilation for dex2oat.
// For the profile format, see
// https://developer.android.com/topic/performance/baselineprofiles/manually-create-measure#define-rules-manually
// (For advanced use only!)
/* ---------- begin profile (enabled=false) ----------
HSPLExampleKt;->square(I)I
LExampleKt;
---------- end profile ---------- */
3 changes: 2 additions & 1 deletion lib/compilers/argument-parsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,8 @@ export class ClangParser extends BaseParser {
static override async getOptions(compiler, helpArg, populate = true, isolate = false) {
const optionFinderWithDesc = /^ {2}?(--?[\d#+,<=>A-Z[\]a-z|-]*\s?[\d+,<=>A-Z[\]a-z|-]*)\s+([A-Z].*)/;
const optionFinderWithoutDesc = /^ {2}?(--?[\d#+,<=>[\]a-z|-]*\s?[\d+,<=>[\]a-z|-]*)/i;
const execOptions = isolate ?? {...compiler.getDefaultExecOptions(), createAndUseTempDir: true};
const execOptions = {...compiler.getDefaultExecOptions()};
if (isolate) execOptions.createAndUseTempDir = true;
const result = await compiler.execCompilerCached(compiler.compiler.exe, helpArg.split(' '), execOptions);
const options =
result.code === 0
Expand Down
Loading

0 comments on commit 26b1274

Please sign in to comment.