From 93c30282cd075989b4bbdabffb6cb084b2967fb7 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Wed, 28 Feb 2024 22:41:17 -0500 Subject: [PATCH] Remove LTO-only builds when PGO+LTO exists --- .github/workflows/apple.yml | 40 ---------------------------- .github/workflows/linux.yml | 52 ------------------------------------- src/release.rs | 4 +-- 3 files changed, 2 insertions(+), 94 deletions(-) diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml index 9265c874..e13d6701 100644 --- a/.github/workflows/apple.yml +++ b/.github/workflows/apple.yml @@ -47,10 +47,6 @@ jobs: runner: macos-14 py: 'cpython-3.8' optimizations: 'debug' - - target_triple: 'aarch64-apple-darwin' - runner: macos-14 - py: 'cpython-3.8' - optimizations: 'lto' - target_triple: 'aarch64-apple-darwin' runner: macos-14 py: 'cpython-3.8' @@ -64,10 +60,6 @@ jobs: runner: macos-14 py: 'cpython-3.9' optimizations: 'debug' - - target_triple: 'aarch64-apple-darwin' - runner: macos-14 - py: 'cpython-3.9' - optimizations: 'lto' - target_triple: 'aarch64-apple-darwin' runner: macos-14 py: 'cpython-3.9' @@ -81,10 +73,6 @@ jobs: runner: macos-14 py: 'cpython-3.10' optimizations: 'debug' - - target_triple: 'aarch64-apple-darwin' - runner: macos-14 - py: 'cpython-3.10' - optimizations: 'lto' - target_triple: 'aarch64-apple-darwin' runner: macos-14 py: 'cpython-3.10' @@ -98,10 +86,6 @@ jobs: runner: macos-14 py: 'cpython-3.11' optimizations: 'debug' - - target_triple: 'aarch64-apple-darwin' - runner: macos-14 - py: 'cpython-3.11' - optimizations: 'lto' - target_triple: 'aarch64-apple-darwin' runner: macos-14 py: 'cpython-3.11' @@ -115,10 +99,6 @@ jobs: runner: macos-14 py: 'cpython-3.12' optimizations: 'debug' - - target_triple: 'aarch64-apple-darwin' - runner: macos-14 - py: 'cpython-3.12' - optimizations: 'lto' - target_triple: 'aarch64-apple-darwin' runner: macos-14 py: 'cpython-3.12' @@ -135,10 +115,6 @@ jobs: runner: macos-13 py: 'cpython-3.8' optimizations: 'debug' - - target_triple: 'x86_64-apple-darwin' - runner: macos-13 - py: 'cpython-3.8' - optimizations: 'lto' - target_triple: 'x86_64-apple-darwin' runner: macos-13 py: 'cpython-3.8' @@ -152,10 +128,6 @@ jobs: runner: macos-13 py: 'cpython-3.9' optimizations: 'debug' - - target_triple: 'x86_64-apple-darwin' - runner: macos-13 - py: 'cpython-3.9' - optimizations: 'lto' - target_triple: 'x86_64-apple-darwin' runner: macos-13 py: 'cpython-3.9' @@ -169,10 +141,6 @@ jobs: runner: macos-13 py: 'cpython-3.10' optimizations: 'debug' - - target_triple: 'x86_64-apple-darwin' - runner: macos-13 - py: 'cpython-3.10' - optimizations: 'lto' - target_triple: 'x86_64-apple-darwin' runner: macos-13 py: 'cpython-3.10' @@ -186,10 +154,6 @@ jobs: runner: macos-13 py: 'cpython-3.11' optimizations: 'debug' - - target_triple: 'x86_64-apple-darwin' - runner: macos-13 - py: 'cpython-3.11' - optimizations: 'lto' - target_triple: 'x86_64-apple-darwin' runner: macos-13 py: 'cpython-3.11' @@ -203,10 +167,6 @@ jobs: runner: macos-13 py: 'cpython-3.12' optimizations: 'debug' - - target_triple: 'x86_64-apple-darwin' - runner: macos-13 - py: 'cpython-3.12' - optimizations: 'lto' - target_triple: 'x86_64-apple-darwin' runner: macos-13 py: 'cpython-3.12' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 94b2c9de..33877c65 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -420,10 +420,6 @@ jobs: py: 'cpython-3.8' optimizations: 'debug' run: true - - target_triple: 'x86_64-unknown-linux-gnu' - py: 'cpython-3.8' - optimizations: 'lto' - run: true - target_triple: 'x86_64-unknown-linux-gnu' py: 'cpython-3.8' optimizations: 'pgo' @@ -437,10 +433,6 @@ jobs: py: 'cpython-3.9' optimizations: 'debug' run: true - - target_triple: 'x86_64-unknown-linux-gnu' - py: 'cpython-3.9' - optimizations: 'lto' - run: true - target_triple: 'x86_64-unknown-linux-gnu' py: 'cpython-3.9' optimizations: 'pgo' @@ -454,10 +446,6 @@ jobs: py: 'cpython-3.10' optimizations: 'debug' run: true - - target_triple: 'x86_64-unknown-linux-gnu' - py: 'cpython-3.10' - optimizations: 'lto' - run: true - target_triple: 'x86_64-unknown-linux-gnu' py: 'cpython-3.10' optimizations: 'pgo' @@ -471,10 +459,6 @@ jobs: py: 'cpython-3.11' optimizations: 'debug' run: true - - target_triple: 'x86_64-unknown-linux-gnu' - py: 'cpython-3.11' - optimizations: 'lto' - run: true - target_triple: 'x86_64-unknown-linux-gnu' py: 'cpython-3.11' optimizations: 'pgo' @@ -488,10 +472,6 @@ jobs: py: 'cpython-3.12' optimizations: 'debug' run: true - - target_triple: 'x86_64-unknown-linux-gnu' - py: 'cpython-3.12' - optimizations: 'lto' - run: true - target_triple: 'x86_64-unknown-linux-gnu' py: 'cpython-3.12' optimizations: 'pgo' @@ -505,10 +485,6 @@ jobs: py: 'cpython-3.9' optimizations: 'debug' run: true - - target_triple: 'x86_64_v2-unknown-linux-gnu' - py: 'cpython-3.9' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v2-unknown-linux-gnu' py: 'cpython-3.9' optimizations: 'pgo' @@ -522,10 +498,6 @@ jobs: py: 'cpython-3.10' optimizations: 'debug' run: true - - target_triple: 'x86_64_v2-unknown-linux-gnu' - py: 'cpython-3.10' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v2-unknown-linux-gnu' py: 'cpython-3.10' optimizations: 'pgo' @@ -539,10 +511,6 @@ jobs: py: 'cpython-3.11' optimizations: 'debug' run: true - - target_triple: 'x86_64_v2-unknown-linux-gnu' - py: 'cpython-3.11' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v2-unknown-linux-gnu' py: 'cpython-3.11' optimizations: 'pgo' @@ -556,10 +524,6 @@ jobs: py: 'cpython-3.12' optimizations: 'debug' run: true - - target_triple: 'x86_64_v2-unknown-linux-gnu' - py: 'cpython-3.12' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v2-unknown-linux-gnu' py: 'cpython-3.12' optimizations: 'pgo' @@ -573,10 +537,6 @@ jobs: py: 'cpython-3.9' optimizations: 'debug' run: true - - target_triple: 'x86_64_v3-unknown-linux-gnu' - py: 'cpython-3.9' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v3-unknown-linux-gnu' py: 'cpython-3.9' optimizations: 'pgo' @@ -590,10 +550,6 @@ jobs: py: 'cpython-3.10' optimizations: 'debug' run: true - - target_triple: 'x86_64_v3-unknown-linux-gnu' - py: 'cpython-3.10' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v3-unknown-linux-gnu' py: 'cpython-3.10' optimizations: 'pgo' @@ -607,10 +563,6 @@ jobs: py: 'cpython-3.11' optimizations: 'debug' run: true - - target_triple: 'x86_64_v3-unknown-linux-gnu' - py: 'cpython-3.11' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v3-unknown-linux-gnu' py: 'cpython-3.11' optimizations: 'pgo' @@ -624,10 +576,6 @@ jobs: py: 'cpython-3.12' optimizations: 'debug' run: true - - target_triple: 'x86_64_v3-unknown-linux-gnu' - py: 'cpython-3.12' - optimizations: 'lto' - run: true - target_triple: 'x86_64_v3-unknown-linux-gnu' py: 'cpython-3.12' optimizations: 'pgo' diff --git a/src/release.rs b/src/release.rs index 8758b911..e8593ef2 100644 --- a/src/release.rs +++ b/src/release.rs @@ -28,7 +28,7 @@ pub static RELEASE_TRIPLES: Lazy> = Lazy:: let mut h = BTreeMap::new(); // macOS. - let macos_suffixes = vec!["debug", "lto", "pgo", "pgo+lto"]; + let macos_suffixes = vec!["debug", "pgo", "pgo+lto"]; h.insert( "aarch64-apple-darwin", TripleRelease { @@ -84,7 +84,7 @@ pub static RELEASE_TRIPLES: Lazy> = Lazy:: ); // Linux. - let linux_suffixes_pgo = vec!["debug", "lto", "pgo", "pgo+lto"]; + let linux_suffixes_pgo = vec!["debug", "pgo", "pgo+lto"]; let linux_suffixes_nopgo = vec!["debug", "lto", "noopt"]; h.insert(