This is an archive of the discontinued LLVM Phabricator instance.

Differential D59020

[StackMaps] Update llvm-readobj to parse V3 Stackmaps
ClosedPublic

Authored by jacob-hughes on Mar 6 2019, 4:16 AM.

Details

Reviewers
reames
skatkov
kavon
wks
Commits
rGe03301a3b32d: [StackMaps] Update llvm-readobj to parse V3 Stackmaps
rL358325: [StackMaps] Update llvm-readobj to parse V3 Stackmaps
Summary

This updates the StackMap parser in the llvm-readobj tool to parse version 3 StackMaps, which were bumped in this revision[1].

Version 3 StackMaps differ in that they have a uint16 sized "location size" field which was added to the Location block in a StackMap record. The record has additional padding for alignment. This was a backwards incompatible change resulting in a StackMap version bump.

[1]: https://reviews.llvm.org/D32629

Diff Detail

Event Timeline

jacob-hughes created this revision.Mar 6 2019, 4:16 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 6 2019, 4:16 AM
Herald added subscribers: jdoerfert, rupprecht. · View Herald Transcript
jacob-hughes updated this revision to Diff 189483.Mar 6 2019, 4:21 AM

Removed missed debug logging info

jacob-hughes edited the summary of this revision. (Show Details)Mar 6 2019, 4:32 AM
reames requested changes to this revision.Mar 7 2019, 7:37 PM

Looks largely reasonable. Several comments to clarify diff to ensure there's not something subtle I'm missing. Once those are done, likely to be a quick LGTM.

llvm/include/llvm/Object/StackMapParser.h
13

Please reupload w/ full context.

118

Please rename to getSize.

157

You've got a couple of additions of new accessors, constants, and one constant rename. Please separate that into it's own patch for the old V2 parser, commit it, and then rebase.

(i.e. please remove the renames and added stuff from the diff so that the meaninful changes are obvious.)

llvm/test/Object/stackmap-dump.test
1

Rather than switching from macho to elf, please add an extra run line for ELF. (i.e. test both)

llvm/tools/llvm-readobj/StackMapPrinter.h
67 ↗(On Diff #189483)

Adding the size is a completely separate change. Please post this separately so that all the test diffs are clear as to which change they related to.

This revision now requires changes to proceed.Mar 7 2019, 7:37 PM
jacob-hughes added a parent revision: D59167: [StackMaps] Add explicit location size accessor to the stackmap parser.Mar 8 2019, 5:05 PM
jacob-hughes updated this revision to Diff 189969.Mar 8 2019, 5:14 PM
jacob-hughes marked an inline comment as done.
jacob-hughes edited the summary of this revision. (Show Details)

Thanks for the review Philip. I've addressed your comments and split this into 3 separate revisions: the first adds the new getSize() accessor; the second (this one) updates the stackmap parser to parse v3 maps; and the third includes the size of the locations in the llvm-readobj -stackmap output.

jacob-hughes added inline comments.Mar 8 2019, 5:15 PM
llvm/test/Object/stackmap-dump.test
1

The reason for this change was that the macho file was created back when v2 stackmaps would have been generated. I recompiled the .ll with with the most recent version of LLVM on my machine (linux) and am not entirely sure how to cross-compile to macho.

If you think it's necessary to have an up to date macho object file too, then I can look into how to make one.

jacob-hughes added a child revision: D59169: [StackMaps] Add location size to llvm-readobj -stackmap output.Mar 8 2019, 5:24 PM
reames accepted this revision.Mar 11 2019, 10:55 AM

LGTM if you're confident in the correctness of the Register -> Indirect changes commented on, otherwise, let's discuss.

llvm/test/Object/stackmap-dump.test
1

Ah, that makes sense.

Given we're effectively removing the V2 parser, and replacing it with a V3 parser, I'm fine with the switch to ELF. Just do me a favour and add a comment to the top of the file about how when the parser format changes, the object file input needs regenerated.

Ideally, I'd like to find a way to reduce the diff (i.e. remove the Macho->ELF pieces and leave only the version pieces), but I don't see an obvious way to do so.

106

These Register to Indirect changes bug me. Do you know why these changed?

This revision is now accepted and ready to land.Mar 11 2019, 10:55 AM
jacob-hughes added a comment.Mar 15 2019, 9:35 AM

Sorry for the delayed reply.

I'm fairly certain that the changes in location from Register to Indirect were not caused by this patch. I did a git bisect and it seems that Record 12 starting spilling to the stack instead of registers as a result of this patch [0].

[0] https://reviews.llvm.org/D24103

reames added a comment.Mar 20 2019, 11:19 AM

Doesn't look like this has landed. Were you waiting for me on anything? I'm comfortable with your explanation.

jacob-hughes added a comment.Mar 21 2019, 4:12 AM

This is my first LLVM PR so I'm not quite sure what happens next. I don't have commit access to the project so will someone need to push this on my behalf? Thanks

jacob-hughes added a comment.Mar 26 2019, 11:33 AM

Hi Philip, do you need anything further from me? If not, please could you merge this on my behalf?

reames requested changes to this revision.Mar 26 2019, 6:28 PM

I think this needs rebased. I tried applying the patch to land it, and got build errors.

This revision now requires changes to proceed.Mar 26 2019, 6:28 PM
jacob-hughes updated this revision to Diff 192798.Mar 29 2019, 3:54 AM

I've updated the diffs for all three revisions after rebasing from the latest master branch. I didn't get any conflicts and it seems to build and pass all the tests fine for me so I'm not sure how much this will help.

If this fails again could you send me the build log so I can see what's going on? The only thing I think it could be right now is the new elf file is not running correctly on a different machine.

undingen added a subscriber: undingen.Mar 29 2019, 7:06 AM
sanjoy removed a reviewer: sanjoy.Mar 31 2019, 10:35 AM
wks requested changes to this revision.Apr 3 2019, 10:59 PM
wks added a subscriber: wks.
wks added inline comments.
llvm/include/llvm/Object/StackMapParser.h
324

The comment should be “Always returns 3” to match the code.

This revision now requires changes to proceed.Apr 3 2019, 10:59 PM
jacob-hughes updated this revision to Diff 193678.Apr 4 2019, 2:32 AM

Updated comment to mention v3 stack maps

jacob-hughes added a comment.Apr 9 2019, 2:47 PM

Ready for re-review and (if accepted) someone to merge on my behalf please

reames mentioned this in rL358322: [StackMaps] Remove format version from the class name [NFC].Apr 12 2019, 7:01 PM
reames mentioned this in rG377f507a9ffd: [StackMaps] Remove format version from the class name [NFC].
This revision was not accepted when it landed; it landed in state Needs Review.Apr 12 2019, 8:54 PM
Closed by commit rL358325: [StackMaps] Update llvm-readobj to parse V3 Stackmaps (authored by reames). · Explain Why
This revision was automatically updated to reflect the committed changes.
reames added a comment.Apr 12 2019, 8:55 PM

I tried applying the patch again, and discovered the problem. Phabricator was stripping out the binary portions, so I wasn't getting the test changes. (I'd also seen a build failure last time, but didn't see that again.)

I went ahead and rebuilt the test locally. There's a few diffs in the tests caused by differences in codegen since the original object file was created. The biggest is we appear to be more aggressive about folding stack references.

Please let me know if you spot any problem with what I submitted.

Revision Contents

PathSize
llvm/
include/
llvm/
Object/
41 lines
test/
Object/
Inputs/
342 lines
tools/
llvm-readobj/
4 lines
2 lines
4 lines

Diff 189969

llvm/include/llvm/Object/StackMapParser.h

//===- StackMapParser.h - StackMap Parsing Support --------------*- C++ -*-===// //===- StackMapParser.h - StackMap Parsing Support --------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef LLVM_CODEGEN_STACKMAPPARSER_H #ifndef LLVM_CODEGEN_STACKMAPPARSER_H
#define LLVM_CODEGEN_STACKMAPPARSER_H #define LLVM_CODEGEN_STACKMAPPARSER_H
#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/iterator_range.h" #include "llvm/ADT/iterator_range.h"
reamesUnsubmitted
Not Done
ReplyInline Actions

Please reupload w/ full context.

reames: Please reupload w/ full context.
#include "llvm/Support/Endian.h" #include "llvm/Support/Endian.h"
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
namespace llvm { namespace llvm {
template <support::endianness Endianness> template <support::endianness Endianness>
class StackMapV2Parser { class StackMapV3Parser {
public: public:
template <typename AccessorT> template <typename AccessorT>
class AccessorIterator { class AccessorIterator {
public: public:
AccessorIterator(AccessorT A) : A(A) {} AccessorIterator(AccessorT A) : A(A) {}
AccessorIterator& operator++() { A = A.next(); return *this; } AccessorIterator& operator++() { A = A.next(); return *this; }
AccessorIterator operator++(int) { AccessorIterator operator++(int) {
Show All 12 Lines public:
AccessorT* operator->() { return &A; } AccessorT* operator->() { return &A; }
private: private:
AccessorT A; AccessorT A;
}; };
/// Accessor for function records. /// Accessor for function records.
class FunctionAccessor { class FunctionAccessor {
friend class StackMapV2Parser; friend class StackMapV3Parser;
public: public:
/// Get the function address. /// Get the function address.
uint64_t getFunctionAddress() const { uint64_t getFunctionAddress() const {
return read<uint64_t>(P); return read<uint64_t>(P);
} }
/// Get the function's stack size. /// Get the function's stack size.
Show All 15 Lines FunctionAccessor next() const {
return FunctionAccessor(P + FunctionAccessorSize); return FunctionAccessor(P + FunctionAccessorSize);
} }
const uint8_t *P; const uint8_t *P;
}; };
/// Accessor for constants. /// Accessor for constants.
class ConstantAccessor { class ConstantAccessor {
friend class StackMapV2Parser; friend class StackMapV3Parser;
public: public:
/// Return the value of this constant. /// Return the value of this constant.
uint64_t getValue() const { return read<uint64_t>(P); } uint64_t getValue() const { return read<uint64_t>(P); }
private: private:
ConstantAccessor(const uint8_t *P) : P(P) {} ConstantAccessor(const uint8_t *P) : P(P) {}
const static int ConstantAccessorSize = sizeof(uint64_t); const static int ConstantAccessorSize = sizeof(uint64_t);
ConstantAccessor next() const { ConstantAccessor next() const {
return ConstantAccessor(P + ConstantAccessorSize); return ConstantAccessor(P + ConstantAccessorSize);
} }
const uint8_t *P; const uint8_t *P;
}; };
enum class LocationKind : uint8_t { enum class LocationKind : uint8_t {
Register = 1, Direct = 2, Indirect = 3, Constant = 4, ConstantIndex = 5 Register = 1, Direct = 2, Indirect = 3, Constant = 4, ConstantIndex = 5
}; };
/// Accessor for location records. /// Accessor for location records.
class LocationAccessor { class LocationAccessor {
friend class StackMapV2Parser; friend class StackMapV3Parser;
friend class RecordAccessor; friend class RecordAccessor;
public: public:
/// Get the Kind for this location. /// Get the Kind for this location.
LocationKind getKind() const { LocationKind getKind() const {
return LocationKind(P[KindOffset]); return LocationKind(P[KindOffset]);
} }
/// Get the Size for this location. /// Get the Size for this location.
uint8_t getSize() const { uint16_t getSize() const {
reamesUnsubmitted
Not Done
ReplyInline Actions

Please rename to getSize.

reames: Please rename to getSize.
return read<uint8_t>(P + SizeOffset); return read<uint16_t>(P + SizeOffset);
} }
/// Get the Dwarf register number for this location. /// Get the Dwarf register number for this location.
uint16_t getDwarfRegNum() const { uint16_t getDwarfRegNum() const {
return read<uint16_t>(P + DwarfRegNumOffset); return read<uint16_t>(P + DwarfRegNumOffset);
} }
Show All 21 Linespublic:
private: private:
LocationAccessor(const uint8_t *P) : P(P) {} LocationAccessor(const uint8_t *P) : P(P) {}
LocationAccessor next() const { LocationAccessor next() const {
return LocationAccessor(P + LocationAccessorSize); return LocationAccessor(P + LocationAccessorSize);
} }
static const int KindOffset = 0; static const int KindOffset = 0;
static const int SizeOffset = KindOffset + sizeof(uint8_t); static const int SizeOffset = KindOffset + sizeof(uint16_t);
reamesUnsubmitted
Not Done
ReplyInline Actions

You've got a couple of additions of new accessors, constants, and one constant rename. Please separate that into it's own patch for the old V2 parser, commit it, and then rebase.

(i.e. please remove the renames and added stuff from the diff so that the meaninful changes are obvious.)

reames: You've got a couple of additions of new accessors, constants, and one constant rename. Please…
static const int DwarfRegNumOffset = SizeOffset + sizeof(uint8_t); static const int DwarfRegNumOffset = SizeOffset + sizeof(uint16_t);
static const int SmallConstantOffset = DwarfRegNumOffset + sizeof(uint16_t); static const int SmallConstantOffset = DwarfRegNumOffset + sizeof(uint32_t);
static const int LocationAccessorSize = sizeof(uint64_t); static const int LocationAccessorSize = sizeof(uint64_t) + sizeof(uint32_t);
const uint8_t *P; const uint8_t *P;
}; };
/// Accessor for stackmap live-out fields. /// Accessor for stackmap live-out fields.
class LiveOutAccessor { class LiveOutAccessor {
friend class StackMapV2Parser; friend class StackMapV3Parser;
friend class RecordAccessor; friend class RecordAccessor;
public: public:
/// Get the Dwarf register number for this live-out. /// Get the Dwarf register number for this live-out.
uint16_t getDwarfRegNum() const { uint16_t getDwarfRegNum() const {
return read<uint16_t>(P + DwarfRegNumOffset); return read<uint16_t>(P + DwarfRegNumOffset);
} }
Show All 14 Lines static const int SizeOffset =
DwarfRegNumOffset + sizeof(uint16_t) + sizeof(uint8_t); DwarfRegNumOffset + sizeof(uint16_t) + sizeof(uint8_t);
static const int LiveOutAccessorSize = sizeof(uint32_t); static const int LiveOutAccessorSize = sizeof(uint32_t);
const uint8_t *P; const uint8_t *P;
}; };
/// Accessor for stackmap records. /// Accessor for stackmap records.
class RecordAccessor { class RecordAccessor {
friend class StackMapV2Parser; friend class StackMapV3Parser;
public: public:
using location_iterator = AccessorIterator<LocationAccessor>; using location_iterator = AccessorIterator<LocationAccessor>;
using liveout_iterator = AccessorIterator<LiveOutAccessor>; using liveout_iterator = AccessorIterator<LiveOutAccessor>;
/// Get the patchpoint/stackmap ID for this record. /// Get the patchpoint/stackmap ID for this record.
uint64_t getID() const { uint64_t getID() const {
return read<uint64_t>(P + PatchpointIDOffset); return read<uint64_t>(P + PatchpointIDOffset);
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines public:
iterator_range<liveout_iterator> liveouts() const { iterator_range<liveout_iterator> liveouts() const {
return make_range(liveouts_begin(), liveouts_end()); return make_range(liveouts_begin(), liveouts_end());
} }
private: private:
RecordAccessor(const uint8_t *P) : P(P) {} RecordAccessor(const uint8_t *P) : P(P) {}
unsigned getNumLiveOutsOffset() const { unsigned getNumLiveOutsOffset() const {
return LocationListOffset + LocationSize * getNumLocations() + unsigned LocOffset =
sizeof(uint16_t); ((LocationListOffset + LocationSize * getNumLocations()) + 7) & ~0x7;
return LocOffset + sizeof(uint16_t);
} }
unsigned getSizeInBytes() const { unsigned getSizeInBytes() const {
unsigned RecordSize = unsigned RecordSize =
getNumLiveOutsOffset() + sizeof(uint16_t) + getNumLiveOuts() * LiveOutSize; getNumLiveOutsOffset() + sizeof(uint16_t) + getNumLiveOuts() * LiveOutSize;
return (RecordSize + 7) & ~0x7; return (RecordSize + 7) & ~0x7;
} }
RecordAccessor next() const { RecordAccessor next() const {
return RecordAccessor(P + getSizeInBytes()); return RecordAccessor(P + getSizeInBytes());
} }
static const unsigned PatchpointIDOffset = 0; static const unsigned PatchpointIDOffset = 0;
static const unsigned InstructionOffsetOffset = static const unsigned InstructionOffsetOffset =
PatchpointIDOffset + sizeof(uint64_t); PatchpointIDOffset + sizeof(uint64_t);
static const unsigned NumLocationsOffset = static const unsigned NumLocationsOffset =
InstructionOffsetOffset + sizeof(uint32_t) + sizeof(uint16_t); InstructionOffsetOffset + sizeof(uint32_t) + sizeof(uint16_t);
static const unsigned LocationListOffset = static const unsigned LocationListOffset =
NumLocationsOffset + sizeof(uint16_t); NumLocationsOffset + sizeof(uint16_t);
static const unsigned LocationSize = sizeof(uint64_t); static const unsigned LocationSize = sizeof(uint64_t) + sizeof(uint32_t);
static const unsigned LiveOutSize = sizeof(uint32_t); static const unsigned LiveOutSize = sizeof(uint32_t);
const uint8_t *P; const uint8_t *P;
}; };
/// Construct a parser for a version-2 stackmap. StackMap data will be read /// Construct a parser for a version-3 stackmap. StackMap data will be read
/// from the given array. /// from the given array.
StackMapV2Parser(ArrayRef<uint8_t> StackMapSection) StackMapV3Parser(ArrayRef<uint8_t> StackMapSection)
: StackMapSection(StackMapSection) { : StackMapSection(StackMapSection) {
ConstantsListOffset = FunctionListOffset + getNumFunctions() * FunctionSize; ConstantsListOffset = FunctionListOffset + getNumFunctions() * FunctionSize;
assert(StackMapSection[0] == 2 && assert(StackMapSection[0] == 3 &&
"StackMapV2Parser can only parse version 2 stackmaps"); "StackMapV3Parser can only parse version 3 stackmaps");
unsigned CurrentRecordOffset = unsigned CurrentRecordOffset =
ConstantsListOffset + getNumConstants() * ConstantSize; ConstantsListOffset + getNumConstants() * ConstantSize;
for (unsigned I = 0, E = getNumRecords(); I != E; ++I) { for (unsigned I = 0, E = getNumRecords(); I != E; ++I) {
StackMapRecordOffsets.push_back(CurrentRecordOffset); StackMapRecordOffsets.push_back(CurrentRecordOffset);
CurrentRecordOffset += CurrentRecordOffset +=
RecordAccessor(&StackMapSection[CurrentRecordOffset]).getSizeInBytes(); RecordAccessor(&StackMapSection[CurrentRecordOffset]).getSizeInBytes();
} }
} }
using function_iterator = AccessorIterator<FunctionAccessor>; using function_iterator = AccessorIterator<FunctionAccessor>;
using constant_iterator = AccessorIterator<ConstantAccessor>; using constant_iterator = AccessorIterator<ConstantAccessor>;
using record_iterator = AccessorIterator<RecordAccessor>; using record_iterator = AccessorIterator<RecordAccessor>;
/// Get the version number of this stackmap. (Always returns 2). /// Get the version number of this stackmap. (Always returns 2).
wksUnsubmitted
Not Done
ReplyInline Actions

The comment should be “Always returns 3” to match the code.

wks: The comment should be “Always returns 3” to match the code.
unsigned getVersion() const { return 2; } unsigned getVersion() const { return 3; }
/// Get the number of functions in the stack map. /// Get the number of functions in the stack map.
uint32_t getNumFunctions() const { uint32_t getNumFunctions() const {
return read<uint32_t>(&StackMapSection[NumFunctionsOffset]); return read<uint32_t>(&StackMapSection[NumFunctionsOffset]);
} }
/// Get the number of large constants in the stack map. /// Get the number of large constants in the stack map.
uint32_t getNumConstants() const { uint32_t getNumConstants() const {
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines

llvm/test/Object/Inputs/stackmap-test.elf-x86-64

  • This binary file was added.

llvm/test/Object/Inputs/stackmap-test.macho-x86-64

  • This binary file was deleted.

llvm/test/Object/stackmap-dump.test

RUN: llvm-readobj -stackmap %p/Inputs/stackmap-test.macho-x86-64 | FileCheck %s RUN: llvm-readobj -stackmap %p/Inputs/stackmap-test.elf-x86-64 | FileCheck %s
reamesUnsubmitted
Not Done
ReplyInline Actions

Rather than switching from macho to elf, please add an extra run line for ELF. (i.e. test both)

reames: Rather than switching from macho to elf, please add an extra run line for ELF. (i.e. test both)
jacob-hughesAuthorUnsubmitted
Done
ReplyInline Actions

The reason for this change was that the macho file was created back when v2 stackmaps would have been generated. I recompiled the .ll with with the most recent version of LLVM on my machine (linux) and am not entirely sure how to cross-compile to macho.

If you think it's necessary to have an up to date macho object file too, then I can look into how to make one.

jacob-hughes: The reason for this change was that the macho file was created back when v2 stackmaps would…
reamesUnsubmitted
Not Done
ReplyInline Actions

Ah, that makes sense.

Given we're effectively removing the V2 parser, and replacing it with a V3 parser, I'm fine with the switch to ELF. Just do me a favour and add a comment to the top of the file about how when the parser format changes, the object file input needs regenerated.

Ideally, I'd like to find a way to reduce the diff (i.e. remove the Macho->ELF pieces and leave only the version pieces), but I don't see an obvious way to do so.

reames: Ah, that makes sense. Given we're effectively removing the V2 parser, and replacing it with a…
; Note: the macho object file in this test was generated in the following way: ; Note: the macho object file in this test was generated in the following way:
; llc -mtriple=x86_64-apple-darwin %p/test/CodeGen/X86/stackmap.ll -o stackmap.s ; llc -mtriple=x86_64-apple-darwin %p/test/CodeGen/X86/stackmap.ll -o stackmap.s
; clang -c stackmap.s -o %p/test/Object/Inputs/stackmap-test.macho-x86-64 ; clang -c stackmap.s -o %p/test/Object/Inputs/stackmap-test.elf-x86-64
CHECK: LLVM StackMap Version: 2 CHECK: LLVM StackMap Version: 3
CHECK-NEXT: Num Functions: 16 CHECK-NEXT: Num Functions: 16
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 24, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 24, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 2 CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 2
CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 4 CHECK-NEXT: Function address: 0, stack size: 8, callsite record count: 4
CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 56, callsite record count: 1
CHECK-NEXT: Function address: 0, stack size: 18446744073709551615, callsite record count: 1 CHECK-NEXT: Function address: 0, stack size: 18446744073709551615, callsite record count: 1
CHECK-NEXT: Num Constants: 3 CHECK-NEXT: Num Constants: 3
CHECK-NEXT: #1: 2147483648 CHECK-NEXT: #1: 2147483648
CHECK-NEXT: #2: 4294967295 CHECK-NEXT: #2: 4294967295
CHECK-NEXT: #3: 4294967296 CHECK-NEXT: #3: 4294967296
CHECK-NEXT: Num Records: 20 CHECK-NEXT: Num Records: 20
CHECK-NEXT: Record ID: 1, instruction offset: 4 CHECK-NEXT: Record ID: 1, instruction offset: 4
CHECK-NEXT: 12 locations: CHECK-NEXT: 12 locations:
CHECK-NEXT: #1: Constant 4294967295 CHECK-NEXT: #1: Constant 4294967295
CHECK-NEXT: #2: Constant 4294967295 CHECK-NEXT: #2: Constant 4294967295
CHECK-NEXT: #3: Constant 65536 CHECK-NEXT: #3: Constant 65536
CHECK-NEXT: #4: Constant 2000000000 CHECK-NEXT: #4: Constant 2000000000
CHECK-NEXT: #5: Constant 2147483647 CHECK-NEXT: #5: Constant 2147483647
CHECK-NEXT: #6: Constant 4294967295 CHECK-NEXT: #6: Constant 4294967295
CHECK-NEXT: #7: Constant 4294967295 CHECK-NEXT: #7: Constant 4294967295
CHECK-NEXT: #8: Constant 0 CHECK-NEXT: #8: Constant 0
CHECK-NEXT: #9: ConstantIndex #0 (2147483648) CHECK-NEXT: #9: ConstantIndex #0 (2147483648)
CHECK-NEXT: #10: ConstantIndex #1 (4294967295) CHECK-NEXT: #10: ConstantIndex #1 (4294967295)
CHECK-NEXT: #11: ConstantIndex #2 (4294967296) CHECK-NEXT: #11: ConstantIndex #2 (4294967296)
CHECK-NEXT: #12: Constant 4294967295 CHECK-NEXT: #12: Constant 4294967295
CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ] CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ]
CHECK: Record ID: 3, instruction offset: 22 CHECK: Record ID: 3, instruction offset: 22
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Register R#3 CHECK-NEXT: #1: Register R#3
CHECK-NEXT: #2: Register R#14 CHECK-NEXT: #2: Register R#14
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 4, instruction offset: 10 CHECK: Record ID: 4, instruction offset: 10
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Register R#5 CHECK-NEXT: #1: Register R#5
CHECK-NEXT: #2: Register R#4 CHECK-NEXT: #2: Register R#4
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 5, instruction offset: 4 CHECK: Record ID: 5, instruction offset: 4
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Register R#0 CHECK-NEXT: #1: Register R#0
CHECK-NEXT: #2: Register R#5 CHECK-NEXT: #2: Register R#5
CHECK-NEXT: 2 live-outs: [ R#0 (8-bytes) R#7 (8-bytes) ] CHECK-NEXT: 2 live-outs: [ R#0 (8-bytes) R#7 (8-bytes) ]
CHECK: Record ID: 6, instruction offset: 4 CHECK: Record ID: 6, instruction offset: 4
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Register R#4 CHECK-NEXT: #1: Register R#4
CHECK-NEXT: #2: Register R#2 CHECK-NEXT: #2: Register R#2
CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ] CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ]
CHECK: Record ID: 7, instruction offset: 10 CHECK: Record ID: 7, instruction offset: 10
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Register R#2 CHECK-NEXT: #1: Register R#2
CHECK-NEXT: #2: Register R#8 CHECK-NEXT: #2: Register R#8
CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ] CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ]
CHECK: Record ID: 8, instruction offset: 10 CHECK: Record ID: 8, instruction offset: 10
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Register R#2 CHECK-NEXT: #1: Register R#2
CHECK-NEXT: #2: Register R#8 CHECK-NEXT: #2: Register R#8
CHECK-NEXT: 2 live-outs: [ R#0 (8-bytes) R#7 (8-bytes) ] CHECK-NEXT: 2 live-outs: [ R#0 (8-bytes) R#7 (8-bytes) ]
CHECK: Record ID: 11, instruction offset: 42 CHECK: Record ID: 11, instruction offset: 4
CHECK-NEXT: 17 locations: CHECK-NEXT: 17 locations:
CHECK-NEXT: #1: Register R#9 CHECK-NEXT: #1: Register R#9
CHECK-NEXT: #2: Register R#14 CHECK-NEXT: #2: Indirect [R#6 + 16]
CHECK-NEXT: #3: Register R#10 CHECK-NEXT: #3: Indirect [R#6 + 24]
CHECK-NEXT: #4: Register R#3 CHECK-NEXT: #4: Indirect [R#6 + 32]
CHECK-NEXT: #5: Register R#0 CHECK-NEXT: #5: Indirect [R#6 + 40]
CHECK-NEXT: #6: Register R#13 CHECK-NEXT: #6: Indirect [R#6 + 48]
CHECK-NEXT: #7: Register R#12 CHECK-NEXT: #7: Indirect [R#6 + 56]
CHECK-NEXT: #8: Register R#15 CHECK-NEXT: #8: Indirect [R#6 + 64]
CHECK-NEXT: #9: Indirect [R#6 + 72] CHECK-NEXT: #9: Indirect [R#6 + 72]
CHECK-NEXT: #10: Indirect [R#6 + 80] CHECK-NEXT: #10: Indirect [R#6 + 80]
CHECK-NEXT: #11: Indirect [R#6 + 88] CHECK-NEXT: #11: Indirect [R#6 + 88]
CHECK-NEXT: #12: Indirect [R#6 + 96] CHECK-NEXT: #12: Indirect [R#6 + 96]
CHECK-NEXT: #13: Indirect [R#6 + 104] CHECK-NEXT: #13: Indirect [R#6 + 104]
CHECK-NEXT: #14: Indirect [R#6 + 112] CHECK-NEXT: #14: Indirect [R#6 + 112]
CHECK-NEXT: #15: Indirect [R#6 + 120] CHECK-NEXT: #15: Indirect [R#6 + 120]
CHECK-NEXT: #16: Indirect [R#6 + 128] CHECK-NEXT: #16: Indirect [R#6 + 128]
CHECK-NEXT: #17: Indirect [R#6 + 136] CHECK-NEXT: #17: Indirect [R#6 + 136]
CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ] CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ]
CHECK: Record ID: 12, instruction offset: 62 CHECK: Record ID: 12, instruction offset: 4
CHECK-NEXT: 17 locations: CHECK-NEXT: 17 locations:
CHECK-NEXT: #1: Register R#0 CHECK-NEXT: #1: Register R#0
CHECK-NEXT: #2: Register R#14 CHECK-NEXT: #2: Indirect [R#6 + 16]
reamesUnsubmitted
Not Done
ReplyInline Actions

These Register to Indirect changes bug me. Do you know why these changed?

reames: These Register to Indirect changes bug me. Do you know why these changed?
CHECK-NEXT: #3: Register R#10 CHECK-NEXT: #3: Indirect [R#6 + 24]
CHECK-NEXT: #4: Register R#9 CHECK-NEXT: #4: Indirect [R#6 + 32]
CHECK-NEXT: #5: Register R#8 CHECK-NEXT: #5: Indirect [R#6 + 40]
CHECK-NEXT: #6: Register R#4 CHECK-NEXT: #6: Indirect [R#6 + 48]
CHECK-NEXT: #7: Register R#1 CHECK-NEXT: #7: Indirect [R#6 + 56]
CHECK-NEXT: #8: Register R#2 CHECK-NEXT: #8: Indirect [R#6 + 64]
CHECK-NEXT: #9: Register R#5 CHECK-NEXT: #9: Indirect [R#6 + 72]
CHECK-NEXT: #10: Register R#3 CHECK-NEXT: #10: Indirect [R#6 + 80]
CHECK-NEXT: #11: Register R#13 CHECK-NEXT: #11: Indirect [R#6 + 88]
CHECK-NEXT: #12: Register R#12 CHECK-NEXT: #12: Indirect [R#6 + 96]
CHECK-NEXT: #13: Register R#15 CHECK-NEXT: #13: Indirect [R#6 + 104]
CHECK-NEXT: #14: Indirect [R#6 + 112] CHECK-NEXT: #14: Indirect [R#6 + 112]
CHECK-NEXT: #15: Indirect [R#6 + 120] CHECK-NEXT: #15: Indirect [R#6 + 120]
CHECK-NEXT: #16: Indirect [R#6 + 128] CHECK-NEXT: #16: Indirect [R#6 + 128]
CHECK-NEXT: #17: Indirect [R#6 + 136] CHECK-NEXT: #17: Indirect [R#6 + 136]
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 13, instruction offset: 50 CHECK: Record ID: 13, instruction offset: 50
CHECK-NEXT: 1 locations: CHECK-NEXT: 1 locations:
CHECK-NEXT: #1: Indirect [R#6 + -48] CHECK-NEXT: #1: Indirect [R#6 + -48]
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 14, instruction offset: 24 CHECK: Record ID: 14, instruction offset: 24
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Register R#0 CHECK-NEXT: #1: Register R#0
CHECK-NEXT: #2: Register R#3 CHECK-NEXT: #2: Register R#3
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 15, instruction offset: 4 CHECK: Record ID: 15, instruction offset: 4
CHECK-NEXT: 1 locations: CHECK-NEXT: 1 locations:
CHECK-NEXT: #1: Constant 33 CHECK-NEXT: #1: Constant 33
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 16, instruction offset: 32 CHECK: Record ID: 16, instruction offset: 16
CHECK-NEXT: 1 locations: CHECK-NEXT: 1 locations:
CHECK-NEXT: #1: Direct R#6 + -32 CHECK-NEXT: #1: Direct R#6 + -40
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 17, instruction offset: 32 CHECK: Record ID: 17, instruction offset: 16
CHECK-NEXT: 2 locations: CHECK-NEXT: 2 locations:
CHECK-NEXT: #1: Direct R#6 + -8 CHECK-NEXT: #1: Direct R#6 + -8
CHECK-NEXT: #2: Direct R#6 + -40 CHECK-NEXT: #2: Direct R#6 + -16
CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ] CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ]
CHECK: Record ID: 4294967295, instruction offset: 4 CHECK: Record ID: 4294967295, instruction offset: 4
CHECK-NEXT: 0 locations: CHECK-NEXT: 0 locations:
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 4294967296, instruction offset: 4 CHECK: Record ID: 4294967296, instruction offset: 4
CHECK-NEXT: 0 locations: CHECK-NEXT: 0 locations:
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 9223372036854775807, instruction offset: 4 CHECK: Record ID: 9223372036854775807, instruction offset: 4
CHECK-NEXT: 0 locations: CHECK-NEXT: 0 locations:
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 18446744073709551615, instruction offset: 4 CHECK: Record ID: 18446744073709551615, instruction offset: 4
CHECK-NEXT: 0 locations: CHECK-NEXT: 0 locations:
CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ] CHECK-NEXT: 1 live-outs: [ R#7 (8-bytes) ]
CHECK: Record ID: 16, instruction offset: 18 CHECK: Record ID: 16, instruction offset: 18
CHECK-NEXT: 1 locations: CHECK-NEXT: 1 locations:
CHECK-NEXT: #1: Indirect [R#6 + -44] CHECK-NEXT: #1: Indirect [R#6 + -44]
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]
CHECK: Record ID: 0, instruction offset: 26 CHECK: Record ID: 0, instruction offset: 25
CHECK-NEXT: 0 locations: CHECK-NEXT: 0 locations:
CHECK-NEXT: 0 live-outs: [ ] CHECK-NEXT: 0 live-outs: [ ]

llvm/tools/llvm-readobj/COFFDumper.cpp

Show First 20 Lines • Show All 992 Lines • ▼ Show 20 Lines
StringRef StackMapContents; StringRef StackMapContents;
StackMapSection.getContents(StackMapContents); StackMapSection.getContents(StackMapContents);
ArrayRef<uint8_t> StackMapContentsArray( ArrayRef<uint8_t> StackMapContentsArray(
reinterpret_cast<const uint8_t*>(StackMapContents.data()), reinterpret_cast<const uint8_t*>(StackMapContents.data()),
StackMapContents.size()); StackMapContents.size());
if (Obj->isLittleEndian()) if (Obj->isLittleEndian())
prettyPrintStackMap( prettyPrintStackMap(
W, StackMapV2Parser<support::little>(StackMapContentsArray)); W, StackMapV3Parser<support::little>(StackMapContentsArray));
else else
prettyPrintStackMap(W, prettyPrintStackMap(W,
StackMapV2Parser<support::big>(StackMapContentsArray)); StackMapV3Parser<support::big>(StackMapContentsArray));
} }
void COFFDumper::printAddrsig() { void COFFDumper::printAddrsig() {
object::SectionRef AddrsigSection; object::SectionRef AddrsigSection;
for (auto Sec : Obj->sections()) { for (auto Sec : Obj->sections()) {
StringRef Name; StringRef Name;
Sec.getName(Name); Sec.getName(Name);
if (Name == ".llvm_addrsig") { if (Name == ".llvm_addrsig") {
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines

llvm/tools/llvm-readobj/ELFDumper.cpp

Show First 20 Lines • Show All 992 Lines • ▼ Show 20 Lines
if (!StackMapSection) if (!StackMapSection)
return; return;
ArrayRef<uint8_t> StackMapContentsArray = ArrayRef<uint8_t> StackMapContentsArray =
unwrapOrError(Obj->getSectionContents(StackMapSection)); unwrapOrError(Obj->getSectionContents(StackMapSection));
prettyPrintStackMap( prettyPrintStackMap(
W, StackMapV2Parser<ELFT::TargetEndianness>(StackMapContentsArray)); W, StackMapV3Parser<ELFT::TargetEndianness>(StackMapContentsArray));
} }
template <class ELFT> void ELFDumper<ELFT>::printGroupSections() { template <class ELFT> void ELFDumper<ELFT>::printGroupSections() {
ELFDumperStyle->printGroupSections(ObjF->getELFFile()); ELFDumperStyle->printGroupSections(ObjF->getELFFile());
} }
template <class ELFT> void ELFDumper<ELFT>::printAddrsig() { template <class ELFT> void ELFDumper<ELFT>::printAddrsig() {
ELFDumperStyle->printAddrsig(ObjF->getELFFile()); ELFDumperStyle->printAddrsig(ObjF->getELFFile());
▲ Show 20 Lines • Show All 992 Lines • Show Last 20 Lines

llvm/tools/llvm-readobj/MachODumper.cpp

Show First 20 Lines • Show All 661 Lines • ▼ Show 20 Linesvoid MachODumper::printStackMap() const {
StringRef StackMapContents; StringRef StackMapContents;
StackMapSection.getContents(StackMapContents); StackMapSection.getContents(StackMapContents);
ArrayRef<uint8_t> StackMapContentsArray( ArrayRef<uint8_t> StackMapContentsArray(
reinterpret_cast<const uint8_t*>(StackMapContents.data()), reinterpret_cast<const uint8_t*>(StackMapContents.data()),
StackMapContents.size()); StackMapContents.size());
if (Obj->isLittleEndian()) if (Obj->isLittleEndian())
prettyPrintStackMap( prettyPrintStackMap(
W, StackMapV2Parser<support::little>(StackMapContentsArray)); W, StackMapV3Parser<support::little>(StackMapContentsArray));
else else
prettyPrintStackMap(W, prettyPrintStackMap(W,
StackMapV2Parser<support::big>(StackMapContentsArray)); StackMapV3Parser<support::big>(StackMapContentsArray));
} }
void MachODumper::printNeededLibraries() { void MachODumper::printNeededLibraries() {
ListScope D(W, "NeededLibraries"); ListScope D(W, "NeededLibraries");
using LibsTy = std::vector<StringRef>; using LibsTy = std::vector<StringRef>;
LibsTy Libs; LibsTy Libs;
▲ Show 20 Lines • Show All 189 Lines • Show Last 20 Lines