From 2e2403972afad87f99ab460e5702396c6d88bc4e Mon Sep 17 00:00:00 2001 From: Steven Johnson Date: Mon, 29 Jul 2024 09:16:24 -0700 Subject: [PATCH] Drop Halide 16 and LLVM 16 from buildbots --- master/master.cfg | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/master/master.cfg b/master/master.cfg index cfc5e46..a686973 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -70,13 +70,11 @@ LLVM_MAIN = 'main' LLVM_RELEASE_19 = 'release_19' LLVM_RELEASE_18 = 'release_18' LLVM_RELEASE_17 = 'release_17' -LLVM_RELEASE_16 = 'release_16' LLVM_BRANCHES = {LLVM_MAIN: VersionedBranch(ref='main', version=Version(20, 0, 0)), LLVM_RELEASE_19: VersionedBranch(ref='release/19.x', version=Version(19, 1, 0)), LLVM_RELEASE_18: VersionedBranch(ref='llvmorg-18.1.8', version=Version(18, 1, 8)), - LLVM_RELEASE_17: VersionedBranch(ref='llvmorg-17.0.6', version=Version(17, 0, 6)), - LLVM_RELEASE_16: VersionedBranch(ref='llvmorg-16.0.6', version=Version(16, 0, 6))} + LLVM_RELEASE_17: VersionedBranch(ref='llvmorg-17.0.6', version=Version(17, 0, 6))} # At any given time, Halide has a main branch, which supports (at least) # the LLVM main branch and the most recent release branch (and maybe one older). @@ -92,18 +90,15 @@ LLVM_BRANCHES = {LLVM_MAIN: VersionedBranch(ref='main', version=Version(20, 0, 0 HALIDE_MAIN = 'main' HALIDE_RELEASE_18 = 'release_18' HALIDE_RELEASE_17 = 'release_17' -HALIDE_RELEASE_16 = 'release_16' _HALIDE_RELEASES = [ HALIDE_RELEASE_18, HALIDE_RELEASE_17, - HALIDE_RELEASE_16, ] HALIDE_BRANCHES = {HALIDE_MAIN: VersionedBranch(ref='main', version=Version(19, 0, 0)), HALIDE_RELEASE_18: VersionedBranch(ref='release/18.x', version=Version(18, 0, 0)), - HALIDE_RELEASE_17: VersionedBranch(ref='release/17.x', version=Version(17, 0, 2)), - HALIDE_RELEASE_16: VersionedBranch(ref='release/16.x', version=Version(16, 0, 6))} + HALIDE_RELEASE_17: VersionedBranch(ref='release/17.x', version=Version(17, 0, 2))} # This lists the Halide branch(es) for which we want to build nightlies; # it's usually desirable to constrain these to save buildbot time (esp on the slower bots) @@ -118,7 +113,6 @@ LLVM_FOR_HALIDE = { HALIDE_MAIN: [LLVM_MAIN, LLVM_RELEASE_19, LLVM_RELEASE_18], HALIDE_RELEASE_18: [LLVM_RELEASE_18], HALIDE_RELEASE_17: [LLVM_RELEASE_17], - HALIDE_RELEASE_16: [LLVM_RELEASE_16], } # WORKERS @@ -2026,8 +2020,6 @@ def prioritize_builders(buildmaster, builders): # releases. We care most about the most recently-released llvm so # that we have a full set of builds for releases, then llvm main # for bisection, then older llvm versions. - if builder_type.llvm_branch in LLVM_FOR_HALIDE[HALIDE_RELEASE_16]: - return 2 if builder_type.llvm_branch in LLVM_FOR_HALIDE[HALIDE_RELEASE_17]: return 3 if builder_type.llvm_branch in LLVM_FOR_HALIDE[HALIDE_RELEASE_18]: