Skip to content

Commit 2400b35

Browse files
committed
Auto merge of rust-lang#140064 - EnzymeAD:enable-autodiff-in-ci, r=<try>
[DO NOT MERGE] start building Enzyme in CI My goal is to put this in CI on April 26, to have a week to land some of the outstanding PRs (removed # in front of it to avoid spamming them every time I do a try build in this PR): 139700 [Ready] 139308 [Ready, blocked on 139700] 140104 [In the queue] 140030 [Landed] 140049 [Almost ready] The autodiff flags PR should land first, but otherwise they don't overlap and are mostly ready, so it shouldn't be too hard to land them. In the meantime, I'll experiment here with some builders. A fix for 140137 (Apple CI) would be nice, but I'm also happy to start with the working linux (x86-64 + aarch) as the most common target, and expand from there. r? `@oli-obk` Tracking: - 124509 **Linux** succeeded try with plugins & llvm-enzyme enabled: dist-x86_64-linux succeeded try with plugins & llvm-enzyme enabled: dist-aarch64-linux **MacOS** failed try with plugins & llvm-enzyme enabled: dist-x86_64-apple (rust-lang#140064 (comment)) failed try with plugins & llvm-enzyme enabled: dist-apple-various (rust-lang#140064 (comment)) failed try with plugins & llvm-enzyme enabled: dist-aarch64-apple (rust-lang#140064 (comment)) **Windows** failed try with plugins & llvm-enzyme enabled: dist-x86_64-mingw (rust-lang#140064 (comment)) try-job: dist-x86_64-linux try-job: dist-aarch64-linux
2 parents 9bfa31f + 142ec6f commit 2400b35

File tree

9 files changed

+10
-112
lines changed

9 files changed

+10
-112
lines changed

src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ ENV RUST_CONFIGURE_ARGS \
8989
--set llvm.thin-lto=true \
9090
--set llvm.libzstd=true \
9191
--set llvm.ninja=false \
92+
--set llvm.enzyme=true \
9293
--set rust.debug-assertions=false \
9394
--set rust.jemalloc \
9495
--set rust.use-lld=true \

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ ENV RUST_CONFIGURE_ARGS \
9090
--set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
9191
--set llvm.thin-lto=true \
9292
--set llvm.ninja=false \
93+
--set llvm.enzyme=true \
9394
--set llvm.libzstd=true \
9495
--set rust.jemalloc \
9596
--set rust.use-lld=true \

src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ ENV RUST_CONFIGURE_ARGS \
3030
--enable-profiler \
3131
--enable-compiler-docs \
3232
--set llvm.libzstd=true
33+
--set llvm.plugins=true \
34+
--set llvm.enzyme=true \
3335
ENV SCRIPT python3 ../x.py --stage 2 test

src/ci/github-actions/jobs.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ auto:
369369
- name: dist-x86_64-apple
370370
env:
371371
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
372-
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
372+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set llvm.plugins=true --set llvm.enzyme=true --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
373373
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
374374
# Ensure that host tooling is built to support our minimum support macOS version.
375375
MACOSX_DEPLOYMENT_TARGET: 10.12
@@ -387,7 +387,7 @@ auto:
387387
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim,aarch64-apple-ios-macabi,x86_64-apple-ios-macabi
388388
# Mac Catalyst cannot currently compile the sanitizer:
389389
# https://github.com/rust-lang/rust/issues/129069
390-
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set target.aarch64-apple-ios-macabi.sanitizers=false --set target.x86_64-apple-ios-macabi.sanitizers=false
390+
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.plugins=true --set llvm.enzyme=true --set target.aarch64-apple-ios-macabi.sanitizers=false --set target.x86_64-apple-ios-macabi.sanitizers=false
391391
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
392392
# Ensure that host tooling is built to support our minimum support macOS version.
393393
# FIXME(madsmtm): This might be redundant, as we're not building host tooling here (?)
@@ -419,6 +419,8 @@ auto:
419419
--enable-profiler
420420
--set rust.jemalloc
421421
--set llvm.ninja=false
422+
--set llvm.plugins=true
423+
--set llvm.enzyme=true
422424
--set rust.lto=thin
423425
--set rust.codegen-units=1
424426
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
@@ -601,6 +603,8 @@ auto:
601603
SCRIPT: python x.py dist bootstrap --include-default-paths
602604
RUST_CONFIGURE_ARGS: >-
603605
--build=x86_64-pc-windows-gnu
606+
--set llvm.plugins=true
607+
--set llvm.enzyme=true
604608
--enable-full-tools
605609
DIST_REQUIRE_ALL_TOOLS: 1
606610
CODEGEN_BACKENDS: llvm,cranelift

tests/ui/autodiff/visibility.rs

-17
This file was deleted.

tests/ui/autodiff/visibility.std_autodiff.stderr

-24
This file was deleted.

tests/ui/feature-gates/feature-gate-autodiff-use.has_support.stderr

-23
This file was deleted.

tests/ui/feature-gates/feature-gate-autodiff-use.no_support.stderr

-29
This file was deleted.

tests/ui/feature-gates/feature-gate-autodiff-use.rs

-17
This file was deleted.

0 commit comments

Comments
 (0)