vk use tbb but tbbmalloc (#179 )

Co-authored-by: lijilin <jilin.li@cocos.com>
add tcmalloc & USE_JOB_SYSTEM_TBB (#172 )
2021-08-16 15:40:19 +08:00 · 2021-08-12 14:32:25 +08:00 · 2021-08-11 15:16:51 +08:00 · 2021-08-11 15:15:23 +08:00 · 2021-08-11 14:50:17 +08:00 · 2021-08-11 14:48:23 +08:00
31 changed files with 22 additions and 63 deletions
@@ -163,15 +163,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
 set_target_properties(tbb PROPERTIES
  IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a
 )
-add_library(tbbmalloc STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_static.a
-)
-add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc_proxy PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_proxy_static.a
-)
-set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb)
+set(tbb_libs_name tbb)

 if(USE_PHYSICS_PHYSX)
  set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)
@@ -174,15 +174,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
 set_target_properties(tbb PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
 )
-add_library(tbbmalloc STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a
-)
-add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc_proxy PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
-)
-set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
+set(tbb_libs_name tbb)

 ## PHYSICS_PHYSX do not support simulator
 # if(USE_PHYSICS_PHYSX)
@@ -170,15 +170,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
 set_target_properties(tbb PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
 )
-add_library(tbbmalloc STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a
-)
-add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc_proxy PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
-)
-set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
+set(tbb_libs_name tbb)

 if(USE_PHYSICS_PHYSX)
  set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
@@ -172,15 +172,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
 set_target_properties(tbb PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
 )
-add_library(tbbmalloc STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a
-)
-add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
-set_target_properties(tbbmalloc_proxy PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
-)
-set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
+set(tbb_libs_name tbb)

 if(USE_PHYSICS_PHYSX)
  set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
@@ -16,18 +16,17 @@ set(CC_TINYDIR_SOURCES
  ${CMAKE_CURRENT_LIST_DIR}/tinydir/tinydir.h
 )

-set(CC_FS_SOURCES
+set(CC_UTILS_SOURCES
  ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c
  ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h
  ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTFWrapper.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
 )


 set(CC_EXTERNAL_SOURCES

-  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
-  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
-
  ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.c
  ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h
 )
@@ -36,7 +35,7 @@ if(NOT USE_MODULES)
  list(APPEND CC_EXTERNAL_SOURCES 
    ${CC_UNZIP_SOURCES}
    ${CC_TINYDIR_SOURCES}
-    ${CC_FS_SOURCES}
+    ${CC_UTILS_SOURCES}
  )
 endif()

@@ -159,6 +159,11 @@ set_target_properties(SDL2Main PROPERTIES
  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2Main.lib
 )

+add_library(tcmalloc SHARED IMPORTED GLOBAL)
+set_target_properties(tcmalloc PROPERTIES
+  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/libtcmalloc_minimal.lib
+)
+
 set(se_libs_name)

 if(USE_SE_V8)
@@ -211,17 +216,7 @@ set_target_properties(tbb PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib
 )
-add_library(tbbmalloc SHARED IMPORTED GLOBAL)
-set_target_properties(tbbmalloc PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.lib
-)
-add_library(tbbmalloc_proxy SHARED IMPORTED GLOBAL)
-set_target_properties(tbbmalloc_proxy PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib
-)
-set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
+set(tbb_libs_name tbb)

 list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)

@@ -260,6 +255,7 @@ list(APPEND CC_EXTERNAL_LIBS
    websockets
    SDL2
    SDL2Main
+    tcmalloc
    ${glslang_libs_name}
    ${tbb_libs_name}
    ${PhysXSDK}
@@ -159,6 +159,11 @@ set_target_properties(SDL2Main PROPERTIES
  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2Main.lib
 )

+add_library(tcmalloc SHARED IMPORTED GLOBAL)
+set_target_properties(tcmalloc PROPERTIES
+  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/libtcmalloc_minimal.lib
+)
+
 set(se_libs_name)

 if(USE_SE_V8)
@@ -210,17 +215,7 @@ set_target_properties(tbb PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib
 )
-add_library(tbbmalloc SHARED IMPORTED GLOBAL)
-set_target_properties(tbbmalloc PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.lib
-)
-add_library(tbbmalloc_proxy SHARED IMPORTED GLOBAL)
-set_target_properties(tbbmalloc_proxy PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib
-)
-set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
+set(tbb_libs_name tbb)

 list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)

@@ -258,6 +253,7 @@ list(APPEND CC_EXTERNAL_LIBS
    websockets
    SDL2
    SDL2Main
+    tcmalloc
    ${glslang_libs_name}
    ${tbb_libs_name}
    ${PhysXSDK}
Author	SHA1	Message	Date
李吉林 GitHub lijilin	05bf167704	vk use tbb but tbbmalloc (#179 ) Co-authored-by: lijilin <jilin.li@cocos.com>	2021-08-16 15:40:19 +08:00
李吉林 GitHub lijilin	fc76ca7afe	add tcmalloc & USE_JOB_SYSTEM_TBB (#172 ) Co-authored-by: lijilin <jilin.li@cocos.com>	2021-08-12 14:32:25 +08:00
江战andGitHub	674cc1fb78	Merge pull request #174 from PatriceJiang/3.3-fix-bindings bugfix: rename variable	2021-08-11 15:16:51 +08:00
Arnold	c51a7e1c57	fix 2	2021-08-11 15:15:23 +08:00
江战andGitHub	303041611f	Merge pull request #173 from PatriceJiang/3.3-fix-bindings Rename vars	2021-08-11 14:50:17 +08:00
Arnold	866613b6dd	move tea to ccutils	2021-08-11 14:48:23 +08:00
江战andGitHub	29c1e7be47	Merge pull request #171 from timlyeee/v3d-gfx-arm64 add x86_64 glslang for ios	2021-08-06 10:25:24 +08:00
LX	f1aa69a54d	add x86_64 glslang for ios	2021-08-06 10:19:40 +08:00
江战andGitHub	b0dcf214d6	Merge pull request #170 from timlyeee/v3d-gfx-arm64 add glslang arm64 libs and lipo together	2021-08-05 15:42:41 +08:00
LX	064445e8a5	add glslang arm64 libs and lipo together	2021-08-05 14:55:13 +08:00