From b4aa7d357022383ae1256b6d5a42498119cb4018 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 3 Jul 2019 17:24:33 +0200 Subject: [PATCH] build: remove broken intel vtune support Support for VTune profiling was added in commit a881b53 from November 2015 but has since bitrotted. Remove it. Fixes: https://github.com/nodejs/node/issues/28310 Refs: https://github.com/nodejs/node/pull/3785 PR-URL: https://github.com/nodejs/node/pull/28522 Reviewed-By: Colin Ihrig Reviewed-By: Rich Trott Reviewed-By: Luigi Pinca --- configure.py | 16 ------------- node.gyp | 1 - node.gypi | 8 ------- src/api/environment.cc | 8 ------- src/node.cc | 4 ---- tools/v8_gypfiles/broken/v8vtune.gyp | 36 ---------------------------- tools/v8_gypfiles/d8.gyp | 7 ------ tools/v8_gypfiles/features.gypi | 6 ----- 8 files changed, 86 deletions(-) delete mode 100644 tools/v8_gypfiles/broken/v8vtune.gyp diff --git a/configure.py b/configure.py index 6a0bfd08609cd6..2376095719f6f1 100755 --- a/configure.py +++ b/configure.py @@ -131,13 +131,6 @@ help="Generate an executable with libgcc and libstdc++ libraries. This " "will not work on OSX when using the default compilation environment") -parser.add_option("--enable-vtune-profiling", - action="store_true", - dest="enable_vtune_profiling", - help="Enable profiling support for Intel VTune profiler to profile " - "JavaScript code executed in nodejs. This feature is only available " - "for x32, x86, and x64 architectures.") - parser.add_option("--enable-pgo-generate", action="store_true", dest="enable_pgo_generate", @@ -992,15 +985,6 @@ def configure_node(o): if flavor == 'aix': o['variables']['node_target_type'] = 'static_library' - if target_arch in ('x86', 'x64', 'ia32', 'x32'): - o['variables']['node_enable_v8_vtunejit'] = b(options.enable_vtune_profiling) - elif options.enable_vtune_profiling: - raise Exception( - 'The VTune profiler for JavaScript is only supported on x32, x86, and x64 ' - 'architectures.') - else: - o['variables']['node_enable_v8_vtunejit'] = 'false' - if flavor != 'linux' and (options.enable_pgo_generate or options.enable_pgo_use): raise Exception( 'The pgo option is supported only on linux.') diff --git a/node.gyp b/node.gyp index 9f8c9ccc6abba9..3f37cf45d6a503 100644 --- a/node.gyp +++ b/node.gyp @@ -21,7 +21,6 @@ 'node_use_openssl%': 'true', 'node_shared_openssl%': 'false', 'node_v8_options%': '', - 'node_enable_v8_vtunejit%': 'false', 'node_core_target_name%': 'node', 'node_lib_target_name%': 'libnode', 'node_intermediate_lib_type%': 'static_library', diff --git a/node.gypi b/node.gypi index cc98b0f7239b72..938455bbae1bde 100644 --- a/node.gypi +++ b/node.gypi @@ -105,14 +105,6 @@ 'defines': [ 'NODE_HAVE_SMALL_ICU=1' ], }]], }], - [ 'node_use_bundled_v8=="true" and \ - node_enable_v8_vtunejit=="true" and (target_arch=="x64" or \ - target_arch=="ia32" or target_arch=="x32")', { - 'defines': [ 'NODE_ENABLE_VTUNE_PROFILING' ], - 'dependencies': [ - 'tools/v8_gypfiles/v8vtune.gyp:v8_vtune' - ], - }], [ 'node_no_browser_globals=="true"', { 'defines': [ 'NODE_NO_BROWSER_GLOBALS' ], } ], diff --git a/src/api/environment.cc b/src/api/environment.cc index fac1298d26fd40..ac1e513967310a 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -7,10 +7,6 @@ #include "node_v8_platform-inl.h" #include "uv.h" -#ifdef NODE_ENABLE_VTUNE_PROFILING -#include "../deps/v8/src/third_party/vtune/v8-vtune.h" -#endif - namespace node { using errors::TryCatchScope; using v8::Array; @@ -188,10 +184,6 @@ void SetIsolateCreateParamsForNode(Isolate::CreateParams* params) { // heap based on the actual physical memory. params->constraints.ConfigureDefaults(total_memory, 0); } - -#ifdef NODE_ENABLE_VTUNE_PROFILING - params->code_event_handler = vTune::GetVtuneCodeEventHandler(); -#endif } void SetIsolateUpForNode(v8::Isolate* isolate, IsolateSettingCategories cat) { diff --git a/src/node.cc b/src/node.cc index 64397d3a80f236..2ffa736f58d389 100644 --- a/src/node.cc +++ b/src/node.cc @@ -64,10 +64,6 @@ #include "inspector/worker_inspector.h" // ParentInspectorHandle #endif -#ifdef NODE_ENABLE_VTUNE_PROFILING -#include "../deps/v8/src/third_party/vtune/v8-vtune.h" -#endif - #ifdef NODE_ENABLE_LARGE_CODE_PAGES #include "large_pages/node_large_page.h" #endif diff --git a/tools/v8_gypfiles/broken/v8vtune.gyp b/tools/v8_gypfiles/broken/v8vtune.gyp deleted file mode 100644 index 2a756d4b8089b3..00000000000000 --- a/tools/v8_gypfiles/broken/v8vtune.gyp +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2012 the V8 project authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'v8_code': 1, - }, - 'includes': ['toolchain.gypi', 'features.gypi'], - 'targets': [ - { - 'target_name': 'v8_vtune', - 'type': 'static_library', - 'dependencies': [ - 'v8.gyp:v8', - ], - 'sources': [ - '../src/third_party/vtune/ittnotify_config.h', - '../src/third_party/vtune/ittnotify_types.h', - '../src/third_party/vtune/jitprofiling.cc', - '../src/third_party/vtune/jitprofiling.h', - '../src/third_party/vtune/v8-vtune.h', - '../src/third_party/vtune/vtune-jit.cc', - '../src/third_party/vtune/vtune-jit.h', - ], - 'direct_dependent_settings': { - 'defines': ['ENABLE_VTUNE_JIT_INTERFACE',], - 'conditions': [ - ['OS != "win"', { - 'libraries': ['-ldl',], - }], - ], - }, - }, - ], -} diff --git a/tools/v8_gypfiles/d8.gyp b/tools/v8_gypfiles/d8.gyp index a5fc10113fac68..240df03380cdcf 100644 --- a/tools/v8_gypfiles/d8.gyp +++ b/tools/v8_gypfiles/d8.gyp @@ -5,8 +5,6 @@ { 'variables': { 'v8_code': 1, - # Enable support for Intel VTune. Supported on ia32/x64 only - 'v8_enable_vtunejit%': 0, 'v8_enable_i18n_support%': 1, }, 'includes': ['toolchain.gypi', 'features.gypi'], @@ -62,11 +60,6 @@ }], ], }], - ['v8_enable_vtunejit==1', { - 'dependencies': [ - 'v8vtune.gyp:v8_vtune', - ], - }], ['v8_enable_i18n_support==1', { 'dependencies': [ '<(icu_gyp_path):icui18n', diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi index 23dd84a49dd013..570c6ace907d3a 100644 --- a/tools/v8_gypfiles/features.gypi +++ b/tools/v8_gypfiles/features.gypi @@ -102,9 +102,6 @@ # Sets -dENABLE_GDB_JIT_INTERFACE. 'v8_enable_gdbjit%': 0, - # Sets -dENABLE_VTUNE_JIT_INTERFACE. - 'v8_enable_vtunejit%': 0, - # Currently set for node by common.gypi, avoiding default because of gyp file bug. # Should be turned on only for debugging. #'v8_enable_handle_zapping%': 0, @@ -225,9 +222,6 @@ ['v8_enable_gdbjit==1', { 'defines': ['ENABLE_GDB_JIT_INTERFACE',], }], - ['v8_enable_vtunejit==1', { - 'defines': ['ENABLE_VTUNE_JIT_INTERFACE',], - }], ['v8_enable_minor_mc==1', { 'defines': ['ENABLE_MINOR_MC',], }],