Skip to content

Commit 1f57a2e

Browse files
CedricGuillemetCopilotCopilot
authored
Add /MP flag for MSVC multiprocessor builds, remove unity build. (#1644)
## Description Adds the MSVC `/MP` (multiprocessor compilation) flag to the root CMakeLists.txt, enabling parallel compilation of source files when building with MSVC. Remove Unity build as not mandatory for BRN Windows prebuilt binaries. ## Changes - Added `add_compile_options(/MP)` in the existing MSVC compiler-flags block in the root `CMakeLists.txt`. Note: build time decrease is not that significant on the CI. Should be better with local builds. local test PG debug full rebuild. no MP : ``` Build: 50 succeeded, 0 failed, 0 up-to-date, 0 skipped ========== ========== Build completed at 2:37 PM and took 01:35.764 minutes ========== ``` with MP: ``` ========== Rebuild All: 50 succeeded, 0 failed, 0 skipped ========== ========== Rebuild completed at 2:42 PM and took 01:01.454 minutes ========== ``` --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 413cb49 commit 1f57a2e

23 files changed

Lines changed: 13 additions & 50 deletions

File tree

.github/jobs/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
displayName: "Select Xcode $(XCODE_VERSION)"
2020
2121
- script: |
22-
cmake -G Xcode -B build/iOS -D IOS=ON -D DEPLOYMENT_TARGET=${{parameters.deploymentTarget}} -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_DEBUG_TRACE=ON -D CMAKE_IOS_INSTALL_COMBINED=NO
22+
cmake -G Xcode -B build/iOS -D IOS=ON -D DEPLOYMENT_TARGET=${{parameters.deploymentTarget}} -D BABYLON_DEBUG_TRACE=ON -D CMAKE_IOS_INSTALL_COMBINED=NO
2323
displayName: "Generate iOS solution"
2424
2525
- task: Xcode@5

.github/jobs/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
displayName: "Install packages"
2929
3030
- script: |
31-
cmake -G Ninja -B build/Linux -D JAVASCRIPTCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.1.so -D NAPI_JAVASCRIPT_ENGINE=${{parameters.JSEngine}} -D CMAKE_BUILD_TYPE=RelWithDebInfo -D BX_CONFIG_DEBUG=ON -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D OpenGL_GL_PREFERENCE=GLVND -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG) .
31+
cmake -G Ninja -B build/Linux -D JAVASCRIPTCORE_LIBRARY=/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.1.so -D NAPI_JAVASCRIPT_ENGINE=${{parameters.JSEngine}} -D CMAKE_BUILD_TYPE=RelWithDebInfo -D BX_CONFIG_DEBUG=ON -D OpenGL_GL_PREFERENCE=GLVND -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG) .
3232
ninja -C build/Linux
3333
displayName: "Build X11"
3434

.github/jobs/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
displayName: "Select XCode $(XCODE_VERSION)"
2424
2525
- script: |
26-
cmake -G "${{parameters.generator}}" -B build/macOS -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG) -D BABYLON_NATIVE_TESTS_USE_NOOP_METAL_DEVICE=ON
26+
cmake -G "${{parameters.generator}}" -B build/macOS -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG) -D BABYLON_NATIVE_TESTS_USE_NOOP_METAL_DEVICE=ON
2727
displayName: "Generate macOS solution"
2828
2929
- script: |

.github/jobs/test_install_ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
displayName: "Select Xcode $(XCODE_VERSION)"
2020
2121
- script: |
22-
cmake -B build/iOS -G Xcode -D IOS=ON -D DEPLOYMENT_TARGET=${{parameters.deploymentTarget}} -D CMAKE_IOS_INSTALL_COMBINED=NO -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
22+
cmake -B build/iOS -G Xcode -D IOS=ON -D DEPLOYMENT_TARGET=${{parameters.deploymentTarget}} -D CMAKE_IOS_INSTALL_COMBINED=NO -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
2323
displayName: "Configure"
2424
2525
- script: |

.github/jobs/test_install_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
displayName: "Install packages"
2626
2727
- script: |
28-
cmake -B build/Linux -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
28+
cmake -B build/Linux -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
2929
displayName: "Configure"
3030
3131
- script: |

.github/jobs/test_install_macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
displayName: "Select XCode $(XCODE_VERSION)"
1919
2020
- script: |
21-
cmake -B build/macOS -G Xcode -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
21+
cmake -B build/macOS -G Xcode -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
2222
displayName: "Configure"
2323
2424
- script: |

.github/jobs/test_install_win32.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
vmImage: ${{parameters.vmImage}}
2020

2121
- script: |
22-
cmake -B build/Win32 -G "Visual Studio 17 2022" -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
22+
cmake -B build/Win32 -G "Visual Studio 17 2022" -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
2323
displayName: "Configure"
2424
2525
- script: |

.github/jobs/uwp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
vmImage: ${{parameters.vmImage}}
3333

3434
- script: |
35-
cmake -G "Visual Studio 17 2022" -B build/${{variables.solutionName}} -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 ${{variables.jsEngineDefine}} -A ${{parameters.platform}} -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_DEBUG_TRACE=ON
35+
cmake -G "Visual Studio 17 2022" -B build/${{variables.solutionName}} -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 ${{variables.jsEngineDefine}} -A ${{parameters.platform}} -D BABYLON_DEBUG_TRACE=ON
3636
displayName: "Generate ${{variables.solutionName}} solution"
3737
3838
- task: VSBuild@1

.github/jobs/win32.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# BGFX_CONFIG_MAX_FRAME_BUFFERS is set so enough Framebuffers are available before V8 starts disposing unused ones
4646
- script: |
47-
cmake -G "Visual Studio 17 2022" -B build/${{variables.solutionName}} -A ${{parameters.platform}} ${{variables.jsEngineDefine}} -D BX_CONFIG_DEBUG=ON -D GRAPHICS_API=${{parameters.graphics_api}} -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BGFX_CONFIG_MAX_FRAME_BUFFERS=256 -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG)
47+
cmake -G "Visual Studio 17 2022" -B build/${{variables.solutionName}} -A ${{parameters.platform}} ${{variables.jsEngineDefine}} -D BX_CONFIG_DEBUG=ON -D GRAPHICS_API=${{parameters.graphics_api}} -D BGFX_CONFIG_MAX_FRAME_BUFFERS=256 -D BABYLON_DEBUG_TRACE=ON -D ENABLE_SANITIZERS=$(SANITIZER_FLAG)
4848
displayName: "Generate ${{variables.solutionName}} solution"
4949
5050
- task: MSBuild@1

.github/jobs/win32_precompiled_shader_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
vmImage: ${{parameters.vmImage}}
2222

2323
- script: |
24-
cmake -G "Visual Studio 17 2022" -B build/${{variables.solutionName}} -A ${{parameters.platform}} -D BX_CONFIG_DEBUG=ON -D GRAPHICS_API=D3D11 -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BGFX_CONFIG_MAX_FRAME_BUFFERS=256 -D BABYLON_DEBUG_TRACE=ON -D BABYLON_NATIVE_PLUGIN_NATIVEENGINE_COMPILESHADERS=OFF
24+
cmake -G "Visual Studio 17 2022" -B build/${{variables.solutionName}} -A ${{parameters.platform}} -D BX_CONFIG_DEBUG=ON -D GRAPHICS_API=D3D11 -D BGFX_CONFIG_MAX_FRAME_BUFFERS=256 -D BABYLON_DEBUG_TRACE=ON -D BABYLON_NATIVE_PLUGIN_NATIVEENGINE_COMPILESHADERS=OFF
2525
displayName: "Generate ${{variables.solutionName}} solution"
2626
2727
- script: |

0 commit comments

Comments
 (0)