Skip to content

executorch/runtime_wrapper: replace fbcode.build_mode_test_label with selects #7201

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

Merged
merged 1 commit into from
Dec 6, 2024
Merged

executorch/runtime_wrapper: replace fbcode.build_mode_test_label with selects #7201

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 18 additions & 30 deletions shim/xplat/executorch/build/runtime_wrapper.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,38 +85,26 @@ def _patch_build_mode_flags(kwargs):
Returns:
The possibly-modified `kwargs` parameter for chaining.
"""
build_mode = native.read_config("fbcode", "build_mode_test_label", "")
flags = []

# Base build modes.
if build_mode.startswith("dev"):
flags.append("-D__ET_BUILD_MODE_DEV=1")
elif build_mode.startswith("opt"):
flags.append("-D__ET_BUILD_MODE_OPT=1")
elif build_mode.startswith("dbgo"):
flags.append("-D__ET_BUILD_MODE_DBGO=1")
elif build_mode.startswith("dbg"):
flags.append("-D__ET_BUILD_MODE_DBG=1")

# Build mode extensions.
if "-cov" in build_mode:
flags.append("-D__ET_BUILD_MODE_COV=1")
elif "-asan" in build_mode:
flags.append("-D__ET_BUILD_MODE_ASAN=1")
elif "-tsan" in build_mode:
flags.append("-D__ET_BUILD_MODE_TSAN=1")
elif "-ubsan" in build_mode:
flags.append("-D__ET_BUILD_MODE_UBSAN=1")
elif "-lto" in build_mode:
flags.append("-D__ET_BUILD_MODE_LTO=1")

if "compiler_flags" not in kwargs:
kwargs["compiler_flags"] = []

# kwargs["compiler_flags"].extend(flags) or kwargs["compiler_flags"] += would
# fail if kwargs["compiler_flags"] is Immutable (ex: the default argument of
# a Buck macro)
kwargs["compiler_flags"] = kwargs["compiler_flags"] + flags
kwargs["compiler_flags"] = kwargs["compiler_flags"] + select({
"DEFAULT": [],
# @oss-disable: "ovr_config//build_mode:dbg": ["-D__ET_BUILD_MODE_DBG=1"],
# @oss-disable: "ovr_config//build_mode:dbgo": ["-D__ET_BUILD_MODE_DBGO=1"],
# @oss-disable: "ovr_config//build_mode:dev": ["-D__ET_BUILD_MODE_DEV=1"],
# @oss-disable: "ovr_config//build_mode:opt": ["-D__ET_BUILD_MODE_OPT=1"],
}) + select({
"DEFAULT": [],
# @oss-disable: "ovr_config//build_mode:asan": ["-D__ET_BUILD_MODE_ASAN=1"],
# @oss-disable: "ovr_config//build_mode:tsan": ["-D__ET_BUILD_MODE_TSAN=1"],
# @oss-disable: "ovr_config//build_mode:ubsan": ["-D__ET_BUILD_MODE_UBSAN=1"],
# @oss-disable: "ovr_config//build_mode:lto-fat": ["-D__ET_BUILD_MODE_LTO=1"],
# @oss-disable: "ovr_config//build_mode:code-coverage": ["-D__ET_BUILD_MODE_COV=1"],
})

return kwargs

Expand All @@ -125,16 +113,16 @@ def _patch_test_compiler_flags(kwargs):
kwargs["compiler_flags"] = []

# Required globally by all c++ tests.
kwargs["compiler_flags"].extend([
kwargs["compiler_flags"] += [
"-std=c++17",
])
]

# Relaxing some constraints for tests
kwargs["compiler_flags"].extend([
kwargs["compiler_flags"] += [
"-Wno-missing-prototypes",
"-Wno-unused-variable",
"-Wno-error",
])
]
return kwargs

def _external_dep_location(name):
Expand Down