[llvm] r314967 - [XRay][tools] Support arg1 logging entries in the basic logging mode
Dean Michael Berris via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 4 22:18:17 PDT 2017
Author: dberris
Date: Wed Oct 4 22:18:17 2017
New Revision: 314967
URL: http://llvm.org/viewvc/llvm-project?rev=314967&view=rev
Log:
[XRay][tools] Support arg1 logging entries in the basic logging mode
Summary:
The arg1 logging handler changed in compiler-rt to start writing a
different type for entries encountered when logging the first argument
of XRay-instrumented functions. This change allows the trace loader to
support reading these record types as well as prepare for when the
basic (naive) mode implementation starts writing down the argument
payloads.
Without this change, binaries with arg1 logging support enabled start
writing unreadable logs for any of the XRay tracing tools.
Reviewers: pelikan
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D38550
Added:
llvm/trunk/test/tools/llvm-xray/X86/Inputs/naive-with-arg1-entries.xray
llvm/trunk/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt
Modified:
llvm/trunk/lib/XRay/Trace.cpp
Modified: llvm/trunk/lib/XRay/Trace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/XRay/Trace.cpp?rev=314967&r1=314966&r2=314967&view=diff
==============================================================================
--- llvm/trunk/lib/XRay/Trace.cpp (original)
+++ llvm/trunk/lib/XRay/Trace.cpp Wed Oct 4 22:18:17 2017
@@ -82,29 +82,59 @@ Error loadNaiveFormatLog(StringRef Data,
for (auto S = Data.drop_front(32); !S.empty(); S = S.drop_front(32)) {
DataExtractor RecordExtractor(S, true, 8);
uint32_t OffsetPtr = 0;
- Records.emplace_back();
- auto &Record = Records.back();
- Record.RecordType = RecordExtractor.getU16(&OffsetPtr);
- Record.CPU = RecordExtractor.getU8(&OffsetPtr);
- auto Type = RecordExtractor.getU8(&OffsetPtr);
- switch (Type) {
- case 0:
- Record.Type = RecordTypes::ENTER;
- break;
- case 1:
- Record.Type = RecordTypes::EXIT;
+ switch (auto RecordType = RecordExtractor.getU16(&OffsetPtr)) {
+ case 0: { // Normal records.
+ Records.emplace_back();
+ auto &Record = Records.back();
+ Record.RecordType = RecordType;
+ Record.CPU = RecordExtractor.getU8(&OffsetPtr);
+ auto Type = RecordExtractor.getU8(&OffsetPtr);
+ switch (Type) {
+ case 0:
+ Record.Type = RecordTypes::ENTER;
+ break;
+ case 1:
+ Record.Type = RecordTypes::EXIT;
+ break;
+ case 2:
+ Record.Type = RecordTypes::TAIL_EXIT;
+ break;
+ case 3:
+ Record.Type = RecordTypes::ENTER_ARG;
+ break;
+ default:
+ return make_error<StringError>(
+ Twine("Unknown record type '") + Twine(int{Type}) + "'",
+ std::make_error_code(std::errc::executable_format_error));
+ }
+ Record.FuncId = RecordExtractor.getSigned(&OffsetPtr, sizeof(int32_t));
+ Record.TSC = RecordExtractor.getU64(&OffsetPtr);
+ Record.TId = RecordExtractor.getU32(&OffsetPtr);
break;
- case 2:
- Record.Type = RecordTypes::TAIL_EXIT;
+ }
+ case 1: { // Arg payload record.
+ auto &Record = Records.back();
+ // Advance two bytes to avoid padding.
+ OffsetPtr += 2;
+ int32_t FuncId = RecordExtractor.getSigned(&OffsetPtr, sizeof(int32_t));
+ auto TId = RecordExtractor.getU32(&OffsetPtr);
+ if (Record.FuncId != FuncId || Record.TId != TId)
+ return make_error<StringError>(
+ Twine("Corrupted log, found payload following non-matching "
+ "function + thread record. Record for ") +
+ Twine(Record.FuncId) + " != " + Twine(FuncId),
+ std::make_error_code(std::errc::executable_format_error));
+ // Advance another four bytes to avoid padding.
+ OffsetPtr += 4;
+ auto Arg = RecordExtractor.getU64(&OffsetPtr);
+ Record.CallArgs.push_back(Arg);
break;
+ }
default:
return make_error<StringError>(
- Twine("Unknown record type '") + Twine(int{Type}) + "'",
+ Twine("Unknown record type == ") + Twine(RecordType),
std::make_error_code(std::errc::executable_format_error));
}
- Record.FuncId = RecordExtractor.getSigned(&OffsetPtr, sizeof(int32_t));
- Record.TSC = RecordExtractor.getU64(&OffsetPtr);
- Record.TId = RecordExtractor.getU32(&OffsetPtr);
}
return Error::success();
}
@@ -234,8 +264,8 @@ Error processCustomEventMarker(FDRState
uint32_t DataSize = RecordExtractor.getU32(&OffsetPtr);
uint64_t TSC = RecordExtractor.getU64(&OffsetPtr);
- // FIXME: Actually represent the record through the API. For now we only skip
- // through the data.
+ // FIXME: Actually represent the record through the API. For now we only
+ // skip through the data.
(void)TSC;
RecordSize = 16 + DataSize;
return Error::success();
@@ -507,8 +537,8 @@ Error loadYAMLLog(StringRef Data, XRayFi
Records.clear();
std::transform(Trace.Records.begin(), Trace.Records.end(),
std::back_inserter(Records), [&](const YAMLXRayRecord &R) {
- return XRayRecord{R.RecordType, R.CPU, R.Type,
- R.FuncId, R.TSC, R.TId, R.CallArgs};
+ return XRayRecord{R.RecordType, R.CPU, R.Type, R.FuncId,
+ R.TSC, R.TId, R.CallArgs};
});
return Error::success();
}
Added: llvm/trunk/test/tools/llvm-xray/X86/Inputs/naive-with-arg1-entries.xray
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/Inputs/naive-with-arg1-entries.xray?rev=314967&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-xray/X86/Inputs/naive-with-arg1-entries.xray (added) and llvm/trunk/test/tools/llvm-xray/X86/Inputs/naive-with-arg1-entries.xray Wed Oct 4 22:18:17 2017 differ
Added: llvm/trunk/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt?rev=314967&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt (added)
+++ llvm/trunk/test/tools/llvm-xray/X86/convert-basic-arg1-to-yaml.txt Wed Oct 4 22:18:17 2017
@@ -0,0 +1,15 @@
+; RUN: llvm-xray convert %S/Inputs/naive-with-arg1-entries.xray -f=yaml -o - | FileCheck %s
+
+; CHECK: ---
+; CHECK-NEXT: header:
+; CHECK-NEXT: version: 2
+; CHECK-NEXT: type: 0
+; CHECK-NEXT: constant-tsc: true
+; CHECK-NEXT: nonstop-tsc: true
+; CHECK-NEXT: cycle-frequency: 3500000000
+; CHECK-NEXT: records:
+; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 17, thread: 8715, kind: function-enter, tsc: 22555670288232728 }
+; CHECK-NEXT: - { type: 0, func-id: 1, function: '1', cpu: 17, thread: 8715, kind: function-exit, tsc: 22555670288334784 }
+; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', args: [ 1 ], cpu: 17, thread: 8715, kind: function-enter-arg, tsc: 22555670288335768 }
+; CHECK-NEXT: - { type: 0, func-id: 2, function: '2', cpu: 17, thread: 8715, kind: function-exit, tsc: 22555670288365224 }
+; CHECK-NEXT: ...
More information about the llvm-commits
mailing list