Skip to content

Commit

Permalink
Some improvements:
Browse files Browse the repository at this point in the history
MSVC fixes;
TurboFan enabled.
  • Loading branch information
guyutongxue committed Nov 23, 2024
1 parent 751b4ec commit d856ad1
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 36 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/ci.yml

This file was deleted.

99 changes: 99 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
name: CMake on multiple platforms

on:
push:
branches: ["main"]
pull_request:
branches: ["main"]

jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
fail-fast: false

# Set up a matrix to run the following 3 configurations:
# 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
# 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
# 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
#
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
build_type: [Release]
# c_compiler: [gcc, clang, cl]
include:
- os: windows-latest
c_compiler: cl
cpp_compiler: cl
- os: ubuntu-latest
c_compiler: gcc
cpp_compiler: g++
- os: macos-latest
c_compiler: clang
cpp_compiler: clang++
# exclude:
# - os: windows-latest
# c_compiler: gcc
# - os: windows-latest
# c_compiler: clang
# - os: ubuntu-latest
# c_compiler: cl

steps:
- uses: actions/checkout@v4

- name: Setup CMake
uses: lukka/get-cmake@latest

- name: Setup Windows dev command
if: ${{ runner.os == 'Windows' }}
uses: ilammy/msvc-dev-cmd@v1

- name: Set reusable strings
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
id: strings
shell: bash
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
- name: Setup cache
id: cache
uses: actions/cache@v4
with:
path: ${{ steps.strings.outputs.build-output-dir }}
key: ${{ runner.os }}-build

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: >
cmake -B ${{ steps.strings.outputs.build-output-dir }}
-GNinja
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-S ${{ github.workspace }}
- name: Patch
if: steps.cache.outputs.cache-hit != 'true'
# https://github.com/microsoft/vcpkg/issues/42251
# A MSVC issue causes v8 failed to compile
shell: bash
run: |
cd '${{ github.workspace }}'
patch -p0 < fix_msvc_19.42.patch
- name: Build
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}

# - name: Test
# working-directory: ${{ steps.strings.outputs.build-output-dir }}
# # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
# # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
# run: ctest --build-config ${{ matrix.build_type }}
15 changes: 14 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ if(MSVC)
v8/src/heap/base/asm/ia32/push_registers_masm.asm
v8/src/heap/base/asm/x64/push_registers_masm.asm
PROPERTY LANGUAGE ASM_MASM)

endif()

add_definitions("-DV8_ENABLE_WEBASSEMBLY -DV8_ADVANCED_BIGINT_ALGORITHMS -DV8_ENABLE_WASM_SIMD256_REVEC")
Expand All @@ -24,6 +23,14 @@ if(WIN32)
add_definitions("-D_WIN32_WINNT=0x0602")
endif()

set(msvc-compile-options /utf-8
/wd4661 /wd4819 /wd4267 /wd4996 /wd4244
/wd4005 /wd4146 /wd4715 /wd4530 /wd4838
/wd4506 /wd4309 /wd4312 /wd4334)
add_compile_options("$<$<C_COMPILER_ID:MSVC>:${msvc-compile-options}>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:${msvc-compile-options}>")
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)

list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
set(THREADS_PREFER_PTHREAD_FLAG ON)

Expand Down Expand Up @@ -88,6 +95,7 @@ string(CONCAT is-x64 $<OR:
>)

option(V8_ENABLE_CONCURRENT_MARKING "Enable concurrent marking" ON)
option(V8_ENABLE_TURBOFAN "Enable TurboFan" ON)
option(V8_ENABLE_I18N "Enable Internationalization support")

set(
Expand All @@ -105,6 +113,7 @@ set(
$<${is-win}:NOMINMAX>
$<$<AND:${is-win},${is-x64}>:V8_OS_WIN_X64>
$<$<BOOL:${V8_ENABLE_CONCURRENT_MARKING}>:V8_CONCURRENT_MARKING>
$<$<BOOL:${V8_ENABLE_TURBOFAN}>:V8_ENABLE_TURBOFAN>
$<${is-win}:V8_OS_WIN32>
)

Expand Down Expand Up @@ -502,6 +511,10 @@ file(GLOB_RECURSE compiler-sources
)
list(FILTER compiler-sources EXCLUDE REGEX ".*backend/.*/.*[.]cc$")

if(V8_ENABLE_TURBOFAN)
list(REMOVE_ITEM compiler-sources v8/src/compiler/turbofan-disabled.cc)
endif()

add_library(v8_compiler STATIC)
target_sources(v8_compiler PRIVATE ${compiler-sources})
target_compile_definitions(v8_compiler PRIVATE ${v8_defines} $<${is-msvc}:_HAS_EXCEPTIONS=0>)
Expand Down

0 comments on commit d856ad1

Please # to comment.