提交 f5b84dcf 编写于 作者: O obdev 提交者: wangzelin.wzl

1. Revert hotfuncs and observer.prof 2. update gtest deps

上级 3b60c27e
......@@ -193,7 +193,7 @@ function build
;;
xrpm)
STATIC_LINK_LGPL_DEPS_OPTION=OFF
do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_USE_LLD=$LLD_OPTION -DENABLE_FATAL_ERROR_HANG=OFF -DOB_STATIC_LINK_LGPL_DEPS=$STATIC_LINK_LGPL_DEPS_OPTION
do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_USE_LLD=$LLD_OPTION -DENABLE_FATAL_ERROR_HANG=OFF -DENABLE_AUTO_FDO=ON -DOB_STATIC_LINK_LGPL_DEPS=$STATIC_LINK_LGPL_DEPS_OPTION
;;
xenable_smart_var_check)
do_build "$@" -DCMAKE_BUILD_TYPE=Debug -DOB_USE_LLD=$LLD_OPTION -DENABLE_SMART_VAR_CHECK=ON -DOB_ENABLE_AVX2=ON
......
......@@ -21,6 +21,7 @@ ob_define(ENABLE_SMART_VAR_CHECK OFF)
ob_define(ENABLE_COMPILE_DLL_MODE OFF)
ob_define(OB_CMAKE_RULES_CHECK ON)
ob_define(OB_STATIC_LINK_LGPL_DEPS ON)
ob_define(HOTFUNC_PATH "${CMAKE_SOURCE_DIR}/hotfuncs.txt")
# 'ENABLE_PERF_MODE' use for offline system insight performance test
# PERF_MODE macro controls many special code path in system
......@@ -40,6 +41,11 @@ if(WITH_COVERAGE)
set(DEBUG_PREFIX "")
endif()
ob_define(AUTO_FDO_OPT "")
if(ENABLE_AUTO_FDO)
set(AUTO_FDO_OPT "-fprofile-sample-use=${CMAKE_SOURCE_DIR}/observer.prof")
endif()
# should not use initial-exec for tls-model if building OBCDC.
if(NOT OB_BUILD_CDC)
......@@ -66,7 +72,7 @@ if (OB_USE_CLANG)
if (OB_USE_LLD)
set(LD_OPT "-fuse-ld=${DEVTOOLS_DIR}/bin/ld.lld")
set(REORDER_COMP_OPT "-ffunction-sections -funique-internal-linkage-names -fdebug-info-for-profiling")
set(REORDER_LINK_OPT "-Wl,--no-rosegment,--build-id=sha1")
set(REORDER_LINK_OPT "-Wl,--no-rosegment,--build-id=sha1,--no-warn-symbol-ordering,--symbol-ordering-file,${HOTFUNC_PATH}")
set(OB_LD_BIN "${DEVTOOLS_DIR}/bin/ld.lld")
endif()
set(CMAKE_CXX_FLAGS "--gcc-toolchain=${GCC9} ${DEBUG_PREFIX} -fcolor-diagnostics ${REORDER_COMP_OPT} -fmax-type-align=8 ${CMAKE_ASAN_FLAG} ${CMAKE_COVERAGE_FLAG} -std=gnu++11")
......
......@@ -14,7 +14,7 @@ arch=aarch64
repo=http://yum.tbsite.net/taobao/7/aarch64/test/ob-deploy/
[deps]
devdeps-gtest-1.8.0-72022092914.el7.aarch64.rpm
devdeps-gtest-1.8.0-132022101316.el7.aarch64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el7.aarch64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el7.aarch64.rpm
devdeps-libunwind-static-1.6.2-222022100410.el7.aarch64.rpm
......
......@@ -9,7 +9,7 @@ arch=x86_64
repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/
[deps]
devdeps-gtest-1.8.0-72022092914.el7.x86_64.rpm
devdeps-gtest-1.8.0-132022101316.el7.x86_64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el7.x86_64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el7.x86_64.rpm
devdeps-libunwind-static-1.6.2-222022100410.el7.x86_64.rpm
......
......@@ -9,7 +9,7 @@ arch=aarch64
repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/aarch64/
[deps]
devdeps-gtest-1.8.0-72022092914.el8.aarch64.rpm
devdeps-gtest-1.8.0-132022101316.el8.aarch64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el8.aarch64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el8.aarch64.rpm
devdeps-libunwind-static-1.6.2-222022100410.el8.aarch64.rpm
......
......@@ -9,7 +9,7 @@ arch=x86_64
repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/x86_64/
[deps]
devdeps-gtest-1.8.0-72022092914.el8.x86_64.rpm
devdeps-gtest-1.8.0-132022101316.el8.x86_64.rpm
devdeps-isa-l-static-2.22.0-22022092915.el8.x86_64.rpm
devdeps-libcurl-static-7.29.0-32022093010.el8.x86_64.rpm
devdeps-libunwind-static-1.6.2-222022100410.el8.x86_64.rpm
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册