Skip to content

add ci cxx flags #1663

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

Closed
Shamzik wants to merge 1 commit into from
Closed

add ci cxx flags #1663

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
25 changes: 24 additions & 1 deletion tests/kphp_ci_pipeline_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@
from python.lib.nocc_for_kphp_tester import nocc_env


KPHP_EXTRA_CXXFLAGS = " ".join([
"-B/opt/binutils-2-35/bin/ -fno-pie -gdwarf64 -gdwarf-5 -gz -fno-var-tracking",
"-femit-struct-debug-baseonly -fdebug-types-section -fmerge-debug-strings",
"-Os -march=sandybridge -mfpmath=sse -mssse3 -Wno-unused-but-set-variable",
"-Wa,--compress-debug-sections -std=gnu++17 -fgcse-after-reload -floop-interchange",
"-fpeel-loops -fpredictive-commoning -ftree-loop-distribution -ftree-loop-vectorize",
"-ftree-partial-pre -ftree-slp-vectorize -funswitch-loops -fvect-cost-model",
"-fvect-cost-model=dynamic",
"-falign-jumps -falign-labels -falign-loops -freorder-blocks-algorithm=stc",
"-no-pie -fsplit-loops -floop-unroll-and-jam -fsplit-paths -ftree-partial-pre",
])


K2_KPHP_TRACKED_BUILTINS_LIST_PATH = pathlib.Path(__file__).parent / "k2_kphp_tracked_builtins_list.txt"
K2_KPHP_TRACKED_BUILTINS_LIST = K2_KPHP_TRACKED_BUILTINS_LIST_PATH.read_text()

Expand Down Expand Up @@ -342,12 +355,14 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
name="kphp-tests",
description="run kphp tests with cxx={}".format(args.cxx_name),
cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} "
"KPHP_EXTRA_CXXFLAGS={KPHP_EXTRA_CXXFLAGS} "
"{kphp_runner} -j{jobs} --cxx-name {cxx_name} {use_nocc_option}".format(
jobs=n_cpu,
kphp_polyfills_repo=kphp_polyfills_repo,
kphp_runner=kphp_test_runner,
cxx_name=args.cxx_name,
use_nocc_option=use_nocc_option,
KPHP_EXTRA_CXXFLAGS=shlex.quote(KPHP_EXTRA_CXXFLAGS),
),
skip=args.steps and "kphp-tests" not in args.steps,
)
Expand All @@ -372,13 +387,15 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
runner.add_test_group(
name="zend-tests",
description="run php tests from zend repo",
cmd="{kphp_runner} -j{jobs} -d {zend_repo} --from-list {zend_tests} --cxx-name {cxx_name} {use_nocc_option}".format(
cmd="KPHP_EXTRA_CXXFLAGS={KPHP_EXTRA_CXXFLAGS} "
"{kphp_runner} -j{jobs} -d {zend_repo} --from-list {zend_tests} --cxx-name {cxx_name} {use_nocc_option}".format(
jobs=n_cpu,
kphp_runner=kphp_test_runner,
zend_repo=args.zend_repo,
zend_tests=zend_test_list,
cxx_name=args.cxx_name,
use_nocc_option=use_nocc_option,
KPHP_EXTRA_CXXFLAGS=shlex.quote(KPHP_EXTRA_CXXFLAGS),
),
skip=args.steps and "zend-tests" not in args.steps,
)
Expand Down Expand Up @@ -422,6 +439,7 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} "
"KPHP_TL_SCHEMA={combined_tlo} "
"KPHP_GEN_TL_INTERNALS=1 "
"KPHP_EXTRA_CXXFLAGS={KPHP_EXTRA_CXXFLAGS} "
"{kphp_runner} -j{jobs} -d {tl_tests_dir} --cxx-name {cxx_name} {use_nocc_option}".format(
jobs=n_cpu,
kphp_polyfills_repo=kphp_polyfills_repo,
Expand All @@ -430,6 +448,7 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
tl_tests_dir=tl_tests_dir,
cxx_name=args.cxx_name,
use_nocc_option=use_nocc_option,
KPHP_EXTRA_CXXFLAGS=shlex.quote(KPHP_EXTRA_CXXFLAGS),
),
skip=args.steps and "typed-tl-tests" not in args.steps,
)
Expand All @@ -439,11 +458,13 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
description="run kphp functional tests with cxx={}".format(args.cxx_name),
cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} "
"KPHP_CXX={cxx_name} "
"KPHP_EXTRA_CXXFLAGS={KPHP_EXTRA_CXXFLAGS} "
"python3 -m pytest --basetemp={base_tempdir} --tb=native -n{jobs} {functional_tests_dir}".format(
kphp_polyfills_repo=kphp_polyfills_repo,
cxx_name=args.cxx_name,
jobs=n_cpu,
functional_tests_dir=functional_tests_dir,
KPHP_EXTRA_CXXFLAGS=shlex.quote(KPHP_EXTRA_CXXFLAGS),
base_tempdir=os.path.expanduser(
"~/_tmp"
), # Workaround to make unix socket paths needed by pytest-mysql have length < 108 symbols
Expand Down Expand Up @@ -487,13 +508,15 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
"KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} "
"KPHP_TESTS_INTERGRATION_TESTS_ENABLED=1 "
"KPHP_CXX={cxx_name} "
"KPHP_EXTRA_CXXFLAGS={KPHP_EXTRA_CXXFLAGS} "
"python3 -m pytest --tb=native -n{jobs} -k '{exclude_pattern}' {tests_dir}".format(
jobs=n_cpu,
lib_dir=os.path.join(runner_dir, "python"),
engine_repo=args.engine_repo,
kphp_repo_root=kphp_repo_root,
kphp_polyfills_repo=kphp_polyfills_repo,
cxx_name=args.cxx_name,
KPHP_EXTRA_CXXFLAGS=shlex.quote(KPHP_EXTRA_CXXFLAGS),
exclude_pattern=(
"not test_load_and_kill_worker" if args.use_asan else ""
), # TODO: ASAN behaves very strange on this test that makes it flaky
Expand Down
Loading