Skip to content

Commit e5dbbba

Browse files
YoungWenMingV8 LUCI CQ
YoungWenMing
authored and
V8 LUCI CQ
committed
Enable --perf-prof flag on MacOS
MacOS actually can share the implementation of {PerfJitLogger} with Linux. From the issue 40112126, only Fuzzer tests on Windows ran into UNREACHABLE/FATAL because of the unimplemented {PerfJitLogger}. This CL enables the flag --perf-prof on MacOS. Bug: 403765219 Change-Id: I97871fbcc0cb9890c51ca14fd7a6e65bd0e3c0d2 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6385655 Reviewed-by: Clemens Backes <[email protected]> Reviewed-by: Matthias Liedtke <[email protected]> Auto-Submit: 杨文明 <[email protected]> Commit-Queue: Clemens Backes <[email protected]> Cr-Commit-Position: refs/heads/main@{#99885}
1 parent b5c9d90 commit e5dbbba

File tree

6 files changed

+80
-79
lines changed

6 files changed

+80
-79
lines changed

‎src/compiler/backend/code-generator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ void CodeGenerator::AssembleCode() {
421421
}
422422
}
423423

424-
// The LinuxPerfJitLogger logs code up until here, excluding the safepoint
424+
// The PerfJitLogger logs code up until here, excluding the safepoint
425425
// table. Resolve the unwinding info now so it is aware of the same code
426426
// size as reported by perf.
427427
unwinding_info_writer_.Finish(masm()->pc_offset());

‎src/diagnostics/perf-jit.cc‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "src/common/assert-scope.h"
3131
#include "src/flags/flags.h"
3232

33-
// Only compile the {LinuxPerfJitLogger} on Linux.
34-
#if V8_OS_LINUX
33+
// Only compile the {PerfJitLogger} on Linux & Darwin.
34+
#if V8_OS_LINUX || V8_OS_DARWIN
3535

3636
#include <fcntl.h>
3737
#include <sys/mman.h>
@@ -118,22 +118,22 @@ struct PerfJitCodeUnwindingInfo : PerfJitBase {
118118
// Followed by size_ - sizeof(PerfJitCodeUnwindingInfo) bytes of data.
119119
};
120120

121-
const char LinuxPerfJitLogger::kFilenameFormatString[] = "%s/jit-%d.dump";
121+
const char PerfJitLogger::kFilenameFormatString[] = "%s/jit-%d.dump";
122122

123123
// Extra padding for the PID in the filename
124-
const int LinuxPerfJitLogger::kFilenameBufferPadding = 16;
124+
const int PerfJitLogger::kFilenameBufferPadding = 16;
125125

126126
static const char kStringTerminator[] = {'\0'};
127127

128128
// The following static variables are protected by
129129
// GetFileMutex().
130-
int LinuxPerfJitLogger::process_id_ = 0;
131-
uint64_t LinuxPerfJitLogger::reference_count_ = 0;
132-
void* LinuxPerfJitLogger::marker_address_ = nullptr;
133-
uint64_t LinuxPerfJitLogger::code_index_ = 0;
134-
FILE* LinuxPerfJitLogger::perf_output_handle_ = nullptr;
130+
int PerfJitLogger::process_id_ = 0;
131+
uint64_t PerfJitLogger::reference_count_ = 0;
132+
void* PerfJitLogger::marker_address_ = nullptr;
133+
uint64_t PerfJitLogger::code_index_ = 0;
134+
FILE* PerfJitLogger::perf_output_handle_ = nullptr;
135135

136-
void LinuxPerfJitLogger::OpenJitDumpFile() {
136+
void PerfJitLogger::OpenJitDumpFile() {
137137
// Open the perf JIT dump file.
138138
perf_output_handle_ = nullptr;
139139

@@ -153,22 +153,31 @@ void LinuxPerfJitLogger::OpenJitDumpFile() {
153153
if (v8_flags.perf_prof_delete_file)
154154
CHECK_EQ(0, unlink(perf_dump_name.begin()));
155155

156+
// On Linux, call OpenMarkerFile so that perf knows about the file path via
157+
// an MMAP record.
158+
// On macOS, don't call OpenMarkerFile because samply has already detected
159+
// the file path during the call to `open` above (it interposes `open` with
160+
// a preloaded library), and because the mmap call can be slow.
161+
#if V8_OS_DARWIN
162+
marker_address_ = nullptr;
163+
#else
156164
marker_address_ = OpenMarkerFile(fd);
157165
if (marker_address_ == nullptr) return;
166+
#endif
158167

159168
perf_output_handle_ = fdopen(fd, "w+");
160169
if (perf_output_handle_ == nullptr) return;
161170

162171
setvbuf(perf_output_handle_, nullptr, _IOFBF, kLogBufferSize);
163172
}
164173

165-
void LinuxPerfJitLogger::CloseJitDumpFile() {
174+
void PerfJitLogger::CloseJitDumpFile() {
166175
if (perf_output_handle_ == nullptr) return;
167176
base::Fclose(perf_output_handle_);
168177
perf_output_handle_ = nullptr;
169178
}
170179

171-
void* LinuxPerfJitLogger::OpenMarkerFile(int fd) {
180+
void* PerfJitLogger::OpenMarkerFile(int fd) {
172181
long page_size = sysconf(_SC_PAGESIZE); // NOLINT(runtime/int)
173182
if (page_size == -1) return nullptr;
174183

@@ -180,15 +189,14 @@ void* LinuxPerfJitLogger::OpenMarkerFile(int fd) {
180189
return (marker_address == MAP_FAILED) ? nullptr : marker_address;
181190
}
182191

183-
void LinuxPerfJitLogger::CloseMarkerFile(void* marker_address) {
192+
void PerfJitLogger::CloseMarkerFile(void* marker_address) {
184193
if (marker_address == nullptr) return;
185194
long page_size = sysconf(_SC_PAGESIZE); // NOLINT(runtime/int)
186195
if (page_size == -1) return;
187196
munmap(marker_address, page_size);
188197
}
189198

190-
LinuxPerfJitLogger::LinuxPerfJitLogger(Isolate* isolate)
191-
: CodeEventLogger(isolate) {
199+
PerfJitLogger::PerfJitLogger(Isolate* isolate) : CodeEventLogger(isolate) {
192200
base::LockGuard<base::RecursiveMutex> guard_file(GetFileMutex().Pointer());
193201
process_id_ = base::OS::GetCurrentProcessId();
194202

@@ -201,7 +209,7 @@ LinuxPerfJitLogger::LinuxPerfJitLogger(Isolate* isolate)
201209
}
202210
}
203211

204-
LinuxPerfJitLogger::~LinuxPerfJitLogger() {
212+
PerfJitLogger::~PerfJitLogger() {
205213
base::LockGuard<base::RecursiveMutex> guard_file(GetFileMutex().Pointer());
206214

207215
reference_count_--;
@@ -211,16 +219,11 @@ LinuxPerfJitLogger::~LinuxPerfJitLogger() {
211219
}
212220
}
213221

214-
uint64_t LinuxPerfJitLogger::GetTimestamp() {
215-
struct timespec ts;
216-
int result = clock_gettime(CLOCK_MONOTONIC, &ts);
217-
DCHECK_EQ(0, result);
218-
USE(result);
219-
static const uint64_t kNsecPerSec = 1000000000;
220-
return (ts.tv_sec * kNsecPerSec) + ts.tv_nsec;
222+
uint64_t PerfJitLogger::GetTimestamp() {
223+
return base::TimeTicks::Now().since_origin().InNanoseconds();
221224
}
222225

223-
void LinuxPerfJitLogger::LogRecordedBuffer(
226+
void PerfJitLogger::LogRecordedBuffer(
224227
Tagged<AbstractCode> abstract_code,
225228
MaybeDirectHandle<SharedFunctionInfo> maybe_sfi, const char* name,
226229
size_t length) {
@@ -264,8 +267,8 @@ void LinuxPerfJitLogger::LogRecordedBuffer(
264267
}
265268

266269
#if V8_ENABLE_WEBASSEMBLY
267-
void LinuxPerfJitLogger::LogRecordedBuffer(const wasm::WasmCode* code,
268-
const char* name, size_t length) {
270+
void PerfJitLogger::LogRecordedBuffer(const wasm::WasmCode* code,
271+
const char* name, size_t length) {
269272
base::LockGuard<base::RecursiveMutex> guard_file(GetFileMutex().Pointer());
270273

271274
if (perf_output_handle_ == nullptr) return;
@@ -277,10 +280,9 @@ void LinuxPerfJitLogger::LogRecordedBuffer(const wasm::WasmCode* code,
277280
}
278281
#endif // V8_ENABLE_WEBASSEMBLY
279282

280-
void LinuxPerfJitLogger::WriteJitCodeLoadEntry(const uint8_t* code_pointer,
281-
uint32_t code_size,
282-
const char* name,
283-
size_t name_length) {
283+
void PerfJitLogger::WriteJitCodeLoadEntry(const uint8_t* code_pointer,
284+
uint32_t code_size, const char* name,
285+
size_t name_length) {
284286
PerfJitCodeLoad code_load;
285287
code_load.event_ = PerfJitCodeLoad::kLoad;
286288
code_load.size_ =
@@ -342,8 +344,8 @@ SourcePositionInfo GetSourcePositionInfo(
342344

343345
} // namespace
344346

345-
void LinuxPerfJitLogger::LogWriteDebugInfo(
346-
Tagged<Code> code, DirectHandle<SharedFunctionInfo> shared) {
347+
void PerfJitLogger::LogWriteDebugInfo(Tagged<Code> code,
348+
DirectHandle<SharedFunctionInfo> shared) {
347349
// Line ends of all scripts have been initialized prior to this.
348350
DisallowGarbageCollection no_gc;
349351
// The WasmToJS wrapper stubs have source position entries.
@@ -425,7 +427,7 @@ void LinuxPerfJitLogger::LogWriteDebugInfo(
425427
}
426428

427429
#if V8_ENABLE_WEBASSEMBLY
428-
void LinuxPerfJitLogger::LogWriteDebugInfo(const wasm::WasmCode* code) {
430+
void PerfJitLogger::LogWriteDebugInfo(const wasm::WasmCode* code) {
429431
if (code->IsAnonymous()) {
430432
return;
431433
}
@@ -497,7 +499,7 @@ void LinuxPerfJitLogger::LogWriteDebugInfo(const wasm::WasmCode* code) {
497499
}
498500
#endif // V8_ENABLE_WEBASSEMBLY
499501

500-
void LinuxPerfJitLogger::LogWriteUnwindingInfo(Tagged<Code> code) {
502+
void PerfJitLogger::LogWriteUnwindingInfo(Tagged<Code> code) {
501503
PerfJitCodeUnwindingInfo unwinding_info_header;
502504
unwinding_info_header.event_ = PerfJitCodeLoad::kUnwindingInfo;
503505
unwinding_info_header.time_stamp_ = GetTimestamp();
@@ -532,13 +534,13 @@ void LinuxPerfJitLogger::LogWriteUnwindingInfo(Tagged<Code> code) {
532534
LogWriteBytes(padding_bytes, padding_size);
533535
}
534536

535-
void LinuxPerfJitLogger::LogWriteBytes(const char* bytes, size_t size) {
537+
void PerfJitLogger::LogWriteBytes(const char* bytes, size_t size) {
536538
size_t rv = fwrite(bytes, 1, size, perf_output_handle_);
537539
DCHECK_EQ(size, rv);
538540
USE(rv);
539541
}
540542

541-
void LinuxPerfJitLogger::LogWriteHeader() {
543+
void PerfJitLogger::LogWriteHeader() {
542544
DCHECK_NOT_NULL(perf_output_handle_);
543545
PerfJitHeader header;
544546

@@ -559,4 +561,4 @@ void LinuxPerfJitLogger::LogWriteHeader() {
559561
} // namespace internal
560562
} // namespace v8
561563

562-
#endif // V8_OS_LINUX
564+
#endif // V8_OS_LINUX || V8_OS_DARWIN

‎src/diagnostics/perf-jit.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030

3131
#include "include/v8config.h"
3232

33-
// {LinuxPerfJitLogger} is only implemented on Linux.
34-
#if V8_OS_LINUX
33+
// {PerfJitLogger} is only implemented on Linux & Darwin.
34+
#if V8_OS_LINUX || V8_OS_DARWIN
3535

3636
#include "src/logging/log.h"
3737

3838
namespace v8 {
3939
namespace internal {
4040

4141
// Linux perf tool logging support.
42-
class LinuxPerfJitLogger : public CodeEventLogger {
42+
class PerfJitLogger : public CodeEventLogger {
4343
public:
44-
explicit LinuxPerfJitLogger(Isolate* isolate);
45-
~LinuxPerfJitLogger() override;
44+
explicit PerfJitLogger(Isolate* isolate);
45+
~PerfJitLogger() override;
4646

4747
void CodeMoveEvent(Tagged<InstructionStream> from,
4848
Tagged<InstructionStream> to) override {
@@ -143,6 +143,6 @@ class LinuxPerfJitLogger : public CodeEventLogger {
143143
} // namespace internal
144144
} // namespace v8
145145

146-
#endif // V8_OS_LINUX
146+
#endif // V8_OS_LINUX || V8_OS_DARWIN
147147

148148
#endif // V8_DIAGNOSTICS_PERF_JIT_H_

‎src/flags/flag-definitions.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3266,7 +3266,7 @@ DEFINE_IMPLICATION(prof, log_code)
32663266

32673267
DEFINE_BOOL(ll_prof, false, "Enable low-level linux profiler.")
32683268

3269-
#if V8_OS_LINUX
3269+
#if V8_OS_LINUX || V8_OS_DARWIN
32703270
#define DEFINE_PERF_PROF_BOOL(nam, cmt) DEFINE_BOOL(nam, false, cmt)
32713271
#define DEFINE_PERF_PROF_IMPLICATION DEFINE_IMPLICATION
32723272
#else
@@ -3283,7 +3283,7 @@ DEFINE_BOOL(ll_prof, false, "Enable low-level linux profiler.")
32833283
#endif
32843284

32853285
DEFINE_PERF_PROF_BOOL(perf_basic_prof,
3286-
"Enable perf linux profiler (basic support).")
3286+
"Enable basic support for perf profiler.")
32873287
DEFINE_NEG_IMPLICATION(perf_basic_prof, compact_code_space)
32883288
DEFINE_STRING(perf_basic_prof_path, DEFAULT_PERF_BASIC_PROF_PATH,
32893289
"directory to write perf-<pid>.map symbol file to")
@@ -3292,8 +3292,8 @@ DEFINE_PERF_PROF_BOOL(
32923292
"Only report function code ranges to perf (i.e. no stubs).")
32933293
DEFINE_PERF_PROF_IMPLICATION(perf_basic_prof_only_functions, perf_basic_prof)
32943294

3295-
DEFINE_PERF_PROF_BOOL(
3296-
perf_prof, "Enable perf linux profiler (experimental annotate support).")
3295+
DEFINE_PERF_PROF_BOOL(perf_prof,
3296+
"Enable experimental annotate support for perf profiler.")
32973297
DEFINE_STRING(perf_prof_path, DEFAULT_PERF_PROF_PATH,
32983298
"directory to write jit-<pid>.dump symbol file to")
32993299
DEFINE_PERF_PROF_BOOL(

‎src/logging/log.cc‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,12 @@ void CodeEventLogger::RegExpCodeCreateEvent(DirectHandle<AbstractCode> code,
350350
name_buffer_->get(), name_buffer_->size());
351351
}
352352

353-
// Linux perf tool logging support.
354-
#if V8_OS_LINUX
355-
class LinuxPerfBasicLogger : public CodeEventLogger {
353+
// Linux & Darwin perf tool logging support.
354+
#if V8_OS_LINUX || V8_OS_DARWIN
355+
class PerfBasicLogger : public CodeEventLogger {
356356
public:
357-
explicit LinuxPerfBasicLogger(Isolate* isolate);
358-
~LinuxPerfBasicLogger() override;
357+
explicit PerfBasicLogger(Isolate* isolate);
358+
~PerfBasicLogger() override;
359359

360360
void CodeMoveEvent(Tagged<InstructionStream> from,
361361
Tagged<InstructionStream> to) override {}
@@ -388,21 +388,20 @@ class LinuxPerfBasicLogger : public CodeEventLogger {
388388
};
389389

390390
// Extra space for the "perf-%d.map" filename, including the PID.
391-
const int LinuxPerfBasicLogger::kFilenameBufferPadding = 32;
391+
const int PerfBasicLogger::kFilenameBufferPadding = 32;
392392

393393
// static
394-
base::LazyRecursiveMutex& LinuxPerfBasicLogger::GetFileMutex() {
394+
base::LazyRecursiveMutex& PerfBasicLogger::GetFileMutex() {
395395
static base::LazyRecursiveMutex file_mutex = LAZY_RECURSIVE_MUTEX_INITIALIZER;
396396
return file_mutex;
397397
}
398398

399399
// The following static variables are protected by
400-
// LinuxPerfBasicLogger::GetFileMutex().
401-
uint64_t LinuxPerfBasicLogger::reference_count_ = 0;
402-
FILE* LinuxPerfBasicLogger::perf_output_handle_ = nullptr;
400+
// PerfBasicLogger::GetFileMutex().
401+
uint64_t PerfBasicLogger::reference_count_ = 0;
402+
FILE* PerfBasicLogger::perf_output_handle_ = nullptr;
403403

404-
LinuxPerfBasicLogger::LinuxPerfBasicLogger(Isolate* isolate)
405-
: CodeEventLogger(isolate) {
404+
PerfBasicLogger::PerfBasicLogger(Isolate* isolate) : CodeEventLogger(isolate) {
406405
base::LockGuard<base::RecursiveMutex> guard_file(GetFileMutex().Pointer());
407406
int process_id_ = base::OS::GetCurrentProcessId();
408407
reference_count_++;
@@ -424,7 +423,7 @@ LinuxPerfBasicLogger::LinuxPerfBasicLogger(Isolate* isolate)
424423
}
425424
}
426425

427-
LinuxPerfBasicLogger::~LinuxPerfBasicLogger() {
426+
PerfBasicLogger::~PerfBasicLogger() {
428427
base::LockGuard<base::RecursiveMutex> guard_file(GetFileMutex().Pointer());
429428
reference_count_--;
430429

@@ -436,9 +435,9 @@ LinuxPerfBasicLogger::~LinuxPerfBasicLogger() {
436435
}
437436
}
438437

439-
void LinuxPerfBasicLogger::WriteLogRecordedBuffer(uintptr_t address,
440-
size_t size, const char* name,
441-
size_t name_length) {
438+
void PerfBasicLogger::WriteLogRecordedBuffer(uintptr_t address, size_t size,
439+
const char* name,
440+
size_t name_length) {
442441
// Linux perf expects hex literals without a leading 0x, while some
443442
// implementations of printf might prepend one when using the %p format
444443
// for pointers, leading to wrongly formatted JIT symbols maps. On the other
@@ -456,9 +455,9 @@ void LinuxPerfBasicLogger::WriteLogRecordedBuffer(uintptr_t address,
456455
#endif
457456
}
458457

459-
void LinuxPerfBasicLogger::LogRecordedBuffer(
460-
Tagged<AbstractCode> code, MaybeDirectHandle<SharedFunctionInfo>,
461-
const char* name, size_t length) {
458+
void PerfBasicLogger::LogRecordedBuffer(Tagged<AbstractCode> code,
459+
MaybeDirectHandle<SharedFunctionInfo>,
460+
const char* name, size_t length) {
462461
DisallowGarbageCollection no_gc;
463462
PtrComprCageBase cage_base(isolate_);
464463
if (v8_flags.perf_basic_prof_only_functions &&
@@ -472,13 +471,13 @@ void LinuxPerfBasicLogger::LogRecordedBuffer(
472471
}
473472

474473
#if V8_ENABLE_WEBASSEMBLY
475-
void LinuxPerfBasicLogger::LogRecordedBuffer(const wasm::WasmCode* code,
476-
const char* name, size_t length) {
474+
void PerfBasicLogger::LogRecordedBuffer(const wasm::WasmCode* code,
475+
const char* name, size_t length) {
477476
WriteLogRecordedBuffer(static_cast<uintptr_t>(code->instruction_start()),
478477
code->instructions().length(), name, length);
479478
}
480479
#endif // V8_ENABLE_WEBASSEMBLY
481-
#endif // V8_OS_LINUX
480+
#endif // V8_OS_LINUX || V8_OS_DARWIN
482481

483482
// External LogEventListener
484483
ExternalLogEventListener::ExternalLogEventListener(Isolate* isolate)
@@ -2304,14 +2303,14 @@ bool V8FileLogger::SetUp(Isolate* isolate) {
23042303
PrepareLogFileName(log_file_name, isolate, v8_flags.logfile);
23052304
log_file_ = std::make_unique<LogFile>(this, log_file_name.str());
23062305

2307-
#if V8_OS_LINUX
2306+
#if V8_OS_LINUX || V8_OS_DARWIN
23082307
if (v8_flags.perf_basic_prof) {
2309-
perf_basic_logger_ = std::make_unique<LinuxPerfBasicLogger>(isolate);
2308+
perf_basic_logger_ = std::make_unique<PerfBasicLogger>(isolate);
23102309
CHECK(logger()->AddListener(perf_basic_logger_.get()));
23112310
}
23122311

23132312
if (v8_flags.perf_prof) {
2314-
perf_jit_logger_ = std::make_unique<LinuxPerfJitLogger>(isolate);
2313+
perf_jit_logger_ = std::make_unique<PerfJitLogger>(isolate);
23152314
CHECK(logger()->AddListener(perf_jit_logger_.get()));
23162315
}
23172316
#else
@@ -2457,7 +2456,7 @@ FILE* V8FileLogger::TearDownAndGetLogFile() {
24572456
ticker_.reset();
24582457
timer_.Stop();
24592458

2460-
#if V8_OS_LINUX
2459+
#if V8_OS_LINUX || V8_OS_DARWIN
24612460
if (perf_basic_logger_) {
24622461
CHECK(logger()->RemoveListener(perf_basic_logger_.get()));
24632462
perf_basic_logger_.reset();

0 commit comments

Comments
 (0)