wallace created this revision.
Herald added subscribers: lldb-commits, mgorny.
Herald added a project: LLDB.
fix PT decoding
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D76872
Files:
lldb/tools/intel-features/CMakeLists.txt
lldb/tools/intel-features/intel-pt/Decoder.cpp
lldb/tools/intel-features/intel-pt/Decoder.h
Index: lldb/tools/intel-features/intel-pt/Decoder.h
===================================================================
--- lldb/tools/intel-features/intel-pt/Decoder.h
+++ lldb/tools/intel-features/intel-pt/Decoder.h
@@ -245,6 +245,22 @@
lldb::SBError &sberror) const;
void DecodeTrace(struct pt_insn_decoder *decoder,
Instructions &instruction_list, lldb::SBError &sberror);
+ int HandlePTInstructionEvents(pt_insn_decoder *decoder, int errcode,
+ Instructions &instruction_list,
+ lldb::SBError &sberror);
+
+ int AppendErrorToInstructionList(int errcode, pt_insn_decoder *decoder,
+ Instructions &instruction_list,
+ lldb::SBError &sberror);
+
+ void AppendErrorWithOffsetToInstructionList(int errcode,
+ uint64_t decoder_offset,
+ Instructions &instruction_list,
+ lldb::SBError &sberror);
+
+ void AppendErrorWithoutOffsetToInstructionList(int errcode,
+ Instructions &instruction_list,
+ lldb::SBError &sberror);
// Function to diagnose and indicate errors during raw trace decoding
void Diagnose(struct pt_insn_decoder *decoder, int errcode,
Index: lldb/tools/intel-features/intel-pt/Decoder.cpp
===================================================================
--- lldb/tools/intel-features/intel-pt/Decoder.cpp
+++ lldb/tools/intel-features/intel-pt/Decoder.cpp
@@ -564,6 +564,63 @@
}
}
+void Decoder::AppendErrorWithOffsetToInstructionList(
+ int errcode, uint64_t decoder_offset, Instructions &instruction_list,
+ lldb::SBError &sberror) {
+ sberror.SetErrorStringWithFormat(
+ "processor trace decoding library: \"%s\" [decoder_offset] => "
+ "[0x%" PRIu64 "]",
+ pt_errstr(pt_errcode(errcode)), decoder_offset);
+ instruction_list.emplace_back(sberror.GetCString());
+}
+
+void Decoder::AppendErrorWithoutOffsetToInstructionList(
+ int errcode, Instructions &instruction_list, lldb::SBError &sberror) {
+ sberror.SetErrorStringWithFormat("processor trace decoding library: \"%s\"",
+ pt_errstr(pt_errcode(errcode)));
+ instruction_list.emplace_back(sberror.GetCString());
+}
+
+int Decoder::AppendErrorToInstructionList(int errcode, pt_insn_decoder *decoder,
+ Instructions &instruction_list,
+ lldb::SBError &sberror) {
+ uint64_t decoder_offset = 0;
+ int errcode_off;
+
+ errcode_off = pt_insn_get_offset(decoder, &decoder_offset);
+ if (errcode_off < 0) {
+ AppendErrorWithoutOffsetToInstructionList(errcode, instruction_list,
+ sberror);
+ return errcode_off;
+ }
+ AppendErrorWithOffsetToInstructionList(errcode, decoder_offset,
+ instruction_list, sberror);
+ return 0;
+}
+
+int Decoder::HandlePTInstructionEvents(pt_insn_decoder *decoder, int errcode,
+ Instructions &instruction_list,
+ lldb::SBError &sberror) {
+ while (errcode & pts_event_pending) {
+ pt_event event;
+ errcode = pt_insn_event(decoder, &event, sizeof(event));
+ if (errcode < 0)
+ return errcode;
+
+ // The list of events are in
+ // https://github.com/intel/libipt/blob/master/doc/man/pt_qry_event.3.md
+ if (event.type == ptev_overflow) {
+ int append_errcode = AppendErrorToInstructionList(
+ errcode, decoder, instruction_list, sberror);
+ if (append_errcode < 0)
+ return append_errcode;
+ }
+ // Other events don't signal stream errors
+ }
+
+ return 0;
+}
+
// Start actual decoding of raw trace
void Decoder::DecodeTrace(struct pt_insn_decoder *decoder,
Instructions &instruction_list,
@@ -585,10 +642,8 @@
int errcode_off = pt_insn_get_offset(decoder, &decoder_offset);
if (errcode_off < 0) {
- sberror.SetErrorStringWithFormat(
- "processor trace decoding library: \"%s\"",
- pt_errstr(pt_errcode(errcode)));
- instruction_list.emplace_back(sberror.GetCString());
+ AppendErrorWithoutOffsetToInstructionList(errcode, instruction_list,
+ sberror);
return;
}
@@ -619,16 +674,22 @@
// progress further. Hence, returning in this situation.
return;
}
- sberror.SetErrorStringWithFormat(
- "processor trace decoding library: \"%s\" [decoder_offset] => "
- "[0x%" PRIu64 "]",
- pt_errstr(pt_errcode(errcode)), new_decoder_offset);
- instruction_list.emplace_back(sberror.GetCString());
+ AppendErrorWithOffsetToInstructionList(errcode, new_decoder_offset,
+ instruction_list, sberror);
decoder_offset = new_decoder_offset;
}
}
while (1) {
+ errcode = HandlePTInstructionEvents(decoder, errcode, instruction_list,
+ sberror);
+ if (errcode < 0) {
+ int append_errcode = AppendErrorToInstructionList(
+ errcode, decoder, instruction_list, sberror);
+ if (append_errcode < 0)
+ return;
+ break;
+ }
errcode = pt_insn_next(decoder, &insn, sizeof(insn));
if (errcode < 0) {
if (insn.iclass == ptic_error)
Index: lldb/tools/intel-features/CMakeLists.txt
===================================================================
--- lldb/tools/intel-features/CMakeLists.txt
+++ lldb/tools/intel-features/CMakeLists.txt
@@ -56,6 +56,7 @@
LINK_LIBS
${FEATURE_LIBS}
+ ${PYTHON_LIBRARY}
)
# Add link dependencies for python wrapper
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
