From 387c2b862446e1d1390d67b3e6d2962af5901382 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:24:00 -0400 Subject: [PATCH 1/3] disable CFL Alias Analysis by default --- tools/include/compiler_options.hpp.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/include/compiler_options.hpp.in b/tools/include/compiler_options.hpp.in index 0547701ce..fa6772c93 100644 --- a/tools/include/compiler_options.hpp.in +++ b/tools/include/compiler_options.hpp.in @@ -80,9 +80,9 @@ static cl::opt fno_lto_opt( "fno-lto", cl::desc("Disable LTO"), cl::cat(LD_CAT)); -static cl::opt fno_cfl_aa_opt( - "fno-cfl-aa", - cl::desc("Disable CFL Alias Analysis"), +static cl::opt fcfl_aa_opt( + "fcfl-aa", + cl::desc("Enable CFL Alias Analysis"), cl::cat(LD_CAT)); static cl::opt fno_stack_first_opt( "fno-stack-first", @@ -617,7 +617,7 @@ static Options CreateOptions(bool add_defaults=true) { else pp_dir = eosio::cdt::whereami::where(); - if (!fno_cfl_aa_opt) { + if (fcfl_aa_opt) { copts.emplace_back("-mllvm"); copts.emplace_back("-use-cfl-aa-in-codegen=both"); agopts.emplace_back("-mllvm"); From bec0d6cac97b29dd464326abff396624f2350baa Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Wed, 21 Aug 2024 21:08:37 -0400 Subject: [PATCH 2/3] remove now removed -fno-cfl-aa from test builds --- tests/unit/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 4407c5189..450c3ed4d 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -5,7 +5,6 @@ include( CDTMacros ) macro(add_cdt_unit_test TEST_NAME) add_native_executable(${TEST_NAME} ${TEST_NAME}.cpp) - target_compile_options(${TEST_NAME} PRIVATE -fno-cfl-aa) if(CMAKE_BUILD_TYPE STREQUAL "Release") target_compile_options(${TEST_NAME} PRIVATE -O2) elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") From 29f4232238b85d0831c805583f199bffffe20aee Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:50:14 -0400 Subject: [PATCH 3/3] change docs for no-cfl-aa removal --- docs/03_command-reference/cdt-cc.md | 2 +- docs/03_command-reference/cdt-cpp.md | 2 +- docs/03_command-reference/cdt-ld.md | 2 +- docs/man/cdt-cc.1.md | 4 ++-- docs/man/cdt-cpp.1.md | 4 ++-- docs/man/cdt-ld.1.md | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/03_command-reference/cdt-cc.md b/docs/03_command-reference/cdt-cc.md index 913e94006..49bcbfe22 100644 --- a/docs/03_command-reference/cdt-cc.md +++ b/docs/03_command-reference/cdt-cc.md @@ -47,7 +47,7 @@ compiler options: -finline-hint-functions - Inline functions which are (explicitly or implicitly) marked inline -fmerge-all-constants - Allow merging of constants -fnative - Compile and link for x86-64 - -fno-cfl-aa - Disable CFL Alias Analysis + -fcfl-aa - Enable CFL Alias Analysis -fno-elide-constructors - Disable C++ copy constructor elision -fno-lto - Disable LTO -fno-post-pass - Don't run post processing pass diff --git a/docs/03_command-reference/cdt-cpp.md b/docs/03_command-reference/cdt-cpp.md index 382f4f485..3942513cd 100644 --- a/docs/03_command-reference/cdt-cpp.md +++ b/docs/03_command-reference/cdt-cpp.md @@ -49,7 +49,7 @@ compiler options: -finline-hint-functions - Inline functions which are (explicitly or implicitly) marked inline -fmerge-all-constants - Allow merging of constants -fnative - Compile and link for x86-64 - -fno-cfl-aa - Disable CFL Alias Analysis + -cfl-aa - Enable CFL Alias Analysis -fno-elide-constructors - Disable C++ copy constructor elision -fno-lto - Disable LTO -fno-post-pass - Don't run post processing pass diff --git a/docs/03_command-reference/cdt-ld.md b/docs/03_command-reference/cdt-ld.md index f4339e91d..8e3b2daa9 100644 --- a/docs/03_command-reference/cdt-ld.md +++ b/docs/03_command-reference/cdt-ld.md @@ -21,7 +21,7 @@ ld options: -L= - Add directory to library search path -fasm - Assemble file for x86-64 -fnative - Compile and link for x86-64 - -fno-cfl-aa - Disable CFL Alias Analysis + -fcfl-aa - Enable CFL Alias Analysis -fno-lto - Disable LTO -fno-post-pass - Don't run post processing pass -fno-stack-first - Don't set the stack first in memory diff --git a/docs/man/cdt-cc.1.md b/docs/man/cdt-cc.1.md index 96d4b2156..e9c670a90 100644 --- a/docs/man/cdt-cc.1.md +++ b/docs/man/cdt-cc.1.md @@ -167,9 +167,9 @@ execution in Antelope block chain virtual machines. Compile and link for x86-64 -**`--fno-cfl-aa`** +**`--fcfl-aa`** - Disable CFL Alias Analysis + Enable CFL Alias Analysis **`--fno-elide-constructors`** diff --git a/docs/man/cdt-cpp.1.md b/docs/man/cdt-cpp.1.md index 95587afd0..8a2a07f39 100644 --- a/docs/man/cdt-cpp.1.md +++ b/docs/man/cdt-cpp.1.md @@ -187,9 +187,9 @@ execution in Antelope block chain virtual machines. Compile and link for x86-64 -**`--fno-cfl-aa`** +**`--fcfl-aa`** - Disable CFL Alias Analysis + Enable CFL Alias Analysis **`--fno-elide-constructors`** diff --git a/docs/man/cdt-ld.1.md b/docs/man/cdt-ld.1.md index 7063e871b..ad5ec25ca 100644 --- a/docs/man/cdt-ld.1.md +++ b/docs/man/cdt-ld.1.md @@ -39,9 +39,9 @@ execution in Antelope block chain virtual machines. Compile and link for x86-64 -**`--fno-cfl-aa`** +**`--fcfl-aa`** - Disable CFL Alias Analysis + Enable CFL Alias Analysis **`--fno-lto`**