Skip to content

MDBF-1185 msan/ubsan/asan with clang 22 #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grooverdan wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

MDBF-1185 msan/ubsan/asan with clang 22 #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
"amd64-fedora-40-valgrind",
"amd64-freebsd-14",
"amd64-msan-clang-20",
"amd64-msan-clang-22",
"amd64-openeuler-2403",
"amd64-openssl3-fips",
"amd64-rhel-7",
Expand Down Expand Up @@ -178,10 +179,13 @@
"amd64-debian-12-debug-embedded",
"amd64-fedora-42",
"amd64-msan-clang-20-debug",
"amd64-msan-clang-22-debug",
"amd64-opensuse-1506",
"amd64-rhel-10",
"amd64-ubasan-clang-20",
"amd64-ubasan-clang-22",
"amd64-ubasan-clang-20-debug",
"amd64-ubasan-clang-22-debug",
"amd64-ubuntu-2404",
"ppc64le-centos-stream10",
"ppc64le-rhel-10",
Expand Down
51 changes: 40 additions & 11 deletions master-migration/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import yaml
import configuration.builders.definitions.connectors.conc as conc_c_builders
import configuration.builders.definitions.connectors.concpp as conc_cc_builders
import configuration.builders.definitions.connectors.conodbc as conc_odbc_builders
from configuration.builders.base import GenericBuilder
from configuration.builders.base import GenericBuilder, WorkerBase
from configuration.builders.common import (
deb_release_builder,
docker_config,
Expand All @@ -33,6 +33,8 @@ from configuration.schedulers.connectors import (
from configuration.workers import worker
from master_common import IS_CHECKCONFIG, base_master_config

from typing import Iterable

####### VARIABLES
cfg_dir = os.path.abspath(os.path.dirname(__file__))
base_dir = os.path.abspath(f"{cfg_dir}/../")
Expand Down Expand Up @@ -157,7 +159,9 @@ c["builders"].append(
## ------------------------------------------------------------------- ##


def ubasan_builder(name: str, debug: bool) -> GenericBuilder:
def ubasan_builder(
name: str, image: str, debug: bool, workers: Iterable[WorkerBase]
) -> GenericBuilder:
tags_ubasan = ("Debian", "clang", "asan", "ubsan", "big")
jobs = 12
if debug:
Expand All @@ -168,22 +172,39 @@ def ubasan_builder(name: str, debug: bool) -> GenericBuilder:
sequences=[
asan_ubsan(
jobs=jobs,
config=docker_config(image="debian12-msan-clang-20", shm_size="24g"),
config=docker_config(image=image, shm_size="24g"),
isDebugBuildType=debug,
)
],
).get_config(
workers=DEFAULT_AMD64_WORKER_POOL,
workers=workers,
tags=list(tags_ubasan),
jobs=jobs,
)


for builder in ["amd64-ubasan-clang-20", "amd64-ubasan-clang-20-debug"]:
c["builders"].append(ubasan_builder(name=builder, debug=builder.endswith("debug")))
sg_bbw1 = WORKER_POOL.get_workers_for_arch(arch="amd64", names=["sg-bbw1"])

for builder, image, workers in [
("amd64-ubasan-clang-20", "debian12-msan-clang-20", DEFAULT_AMD64_WORKER_POOL),
(
"amd64-ubasan-clang-20-debug",
"debian12-msan-clang-20",
DEFAULT_AMD64_WORKER_POOL,
),
("amd64-ubasan-clang-22", "debian13-msan-clang-22", sg_bbw1),
("amd64-ubasan-clang-22-debug", "debian13-msan-clang-22", sg_bbw1),
]:
c["builders"].append(
ubasan_builder(
name=builder, image=image, debug=builder.endswith("debug"), workers=workers
)
)

def msan_builder(name: str, debug: bool) -> GenericBuilder:

def msan_builder(
name: str, image: str, debug: bool, workers: Iterable[WorkerBase]
) -> GenericBuilder:
tags_msan = ("Debian", "clang", "msan", "big")
jobs = 12
if debug:
Expand All @@ -195,19 +216,27 @@ def msan_builder(name: str, debug: bool) -> GenericBuilder:
sequences=[
msan(
jobs=jobs,
config=docker_config(image="debian12-msan-clang-20", shm_size="24g"),
config=docker_config(image=image, shm_size="24g"),
isDebugBuildType=debug,
)
],
).get_config(
workers=DEFAULT_AMD64_WORKER_POOL,
workers=workers,
tags=list(tags_msan),
jobs=jobs,
)


builder = "amd64-msan-clang-20-debug"
c["builders"].append(msan_builder(name=builder, debug=builder.endswith("debug")))
for builder, image, workers in [
("amd64-msan-clang-20-debug", "debian12-msan-clang-20", DEFAULT_AMD64_WORKER_POOL),
("amd64-msan-clang-22", "debian13-msan-clang-22", sg_bbw1),
("amd64-msan-clang-22-debug", "debian13-msan-clang-22", sg_bbw1),
]:
c["builders"].append(
msan_builder(
name=builder, image=image, debug=builder.endswith("debug"), workers=workers
)
)

## ------------------------------------------------------------------- ##
## MTR EXTENDED COVERAGE BUILDERS ##
Expand Down