This is an archive of the discontinued LLVM Phabricator instance.

Differential D64871

[llvm-lipo] Implement alignment function in -create
ClosedPublic

Authored by anushabasana on Jul 17 2019, 10:21 AM.

Details

Reviewers
smeenai
alexander-shaposhnikov
compnerd
mtrent
Commits
rG5aee1c6b102f: [llvm-lipo] Implement alignment function in -create
rL366970: [llvm-lipo] Implement alignment function in -create
Summary

Removes hard coded valuse for alignment in -create.

Test Plan: check-llvm

Diff Detail

Event Timeline

anushabasana created this revision.Jul 17 2019, 10:21 AM
Herald added subscribers: llvm-commits, hiraditya. · View Herald TranscriptJul 17 2019, 10:21 AM
Harbormaster completed remote builds in B35179: Diff 210363.Jul 17 2019, 10:21 AM
anushabasana removed reviewers: smeenai, alexander-shaposhnikov, compnerd, mtrent.Jul 17 2019, 10:32 AM
anushabasana changed the visibility from "Public (No Login Required)" to "anushabasana (Anusha Basana)".
anushabasana changed the edit policy from "All Users" to "anushabasana (Anusha Basana)".
anushabasana removed a project: Restricted Project.
anushabasana removed subscribers: hiraditya, llvm-commits.
Herald added a project: Restricted Project. · View Herald TranscriptJul 17 2019, 10:32 AM
anushabasana added reviewers: smeenai, alexander-shaposhnikov, compnerd, mtrent.Jul 17 2019, 10:46 AM
anushabasana changed the visibility from "anushabasana (Anusha Basana)" to "Public (No Login Required)".
anushabasana changed the edit policy from "anushabasana (Anusha Basana)" to "All Users".
anushabasana added subscribers: hiraditya, llvm-commits.Jul 17 2019, 10:54 AM
anushabasana updated this revision to Diff 210371.EditedJul 17 2019, 11:07 AM

Include changes: spacing and compile error fix

Harbormaster completed remote builds in B35182: Diff 210371.Jul 17 2019, 11:10 AM
compnerd added inline comments.Jul 20 2019, 12:10 PM
llvm/lib/Object/MachOUniversal.cpp
164

Personally, I would have split the changes in this file and in MachOUniversal.h into a separate change. That change is a very simple change that could probably merged immediately.

llvm/test/tools/llvm-lipo/Inputs/CPU10-slice.yaml
1

CPU10 is not particularly helpful. Would be nice to use the human readable form (m88k).

llvm/test/tools/llvm-lipo/Inputs/CPU14-slice.yaml
1

Similar for the file name

llvm/tools/llvm-lipo/llvm-lipo.cpp
350

ITYM segment instead of all load commands. The alignment of something like LC_REEXPORT_DYLIB seems irrelevant to this or am I mistaken on that?

alexander-shaposhnikov added inline comments.Jul 20 2019, 2:00 PM
llvm/tools/llvm-lipo/llvm-lipo.cpp
352

const MachOObjectFile *ObjectFile -> const MachOObjectFile &O

anushabasana marked 3 inline comments as done.Jul 22 2019, 2:31 PM
anushabasana added inline comments.
llvm/test/tools/llvm-lipo/Inputs/CPU10-slice.yaml
1

This file and CPU14 are both intended to go into calculateSegmentAlignment() since they are not any of the valid architectures. I just manually changes the CPU types for testing. What would the best naming convention be for this situation?

anushabasana updated this revision to Diff 211198.Jul 22 2019, 2:40 PM

Address review comment + removed public MaxSectionAlignment variable to different diff.

anushabasana marked an inline comment as done.Jul 22 2019, 2:40 PM
Harbormaster completed remote builds in B35491: Diff 211198.Jul 22 2019, 2:43 PM
compnerd accepted this revision.Jul 23 2019, 9:16 PM
This revision is now accepted and ready to land.Jul 23 2019, 9:16 PM
alexander-shaposhnikov added inline comments.Jul 24 2019, 2:26 PM
llvm/tools/llvm-lipo/llvm-lipo.cpp
355

const bool

anushabasana marked 3 inline comments as done.Jul 24 2019, 3:47 PM
anushabasana updated this revision to Diff 211619.Jul 24 2019, 3:47 PM

const bool

Harbormaster completed remote builds in B35614: Diff 211619.Jul 24 2019, 3:50 PM
Closed by commit rL366970: [llvm-lipo] Implement alignment function in -create (authored by smeenai). · Explain WhyJul 24 2019, 5:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
include/
llvm/
Object/
2 lines
lib/
Object/
13 lines
test/
tools/
llvm-lipo/
Inputs/
359 lines
88 lines
20 lines
create-default-alignment.test
create-without-alignment.test
32 lines
tools/
llvm-lipo/
49 lines

Diff 210371

llvm/include/llvm/Object/MachOUniversal.h

Show All 25 Lines
namespace object { namespace object {
class MachOUniversalBinary : public Binary { class MachOUniversalBinary : public Binary {
virtual void anchor(); virtual void anchor();
uint32_t Magic; uint32_t Magic;
uint32_t NumberOfObjects; uint32_t NumberOfObjects;
public: public:
static constexpr uint32_t MaxSectionAlignment = 15; /* 2**15 or 0x8000 */
class ObjectForArch { class ObjectForArch {
const MachOUniversalBinary *Parent; const MachOUniversalBinary *Parent;
/// Index of object in the universal binary. /// Index of object in the universal binary.
uint32_t Index; uint32_t Index;
/// Descriptor of the object. /// Descriptor of the object.
MachO::fat_arch Header; MachO::fat_arch Header;
MachO::fat_arch_64 Header64; MachO::fat_arch_64 Header64;
▲ Show 20 Lines • Show All 126 Lines • Show Last 20 Lines

llvm/lib/Object/MachOUniversal.cpp

Show First 20 Lines • Show All 149 Lines • ▼ Show 20 Lines for (uint32_t i = 0; i < NumberOfObjects; i++) {
bigSize += A.getSize(); bigSize += A.getSize();
if (bigSize > Buf.size()) { if (bigSize > Buf.size()) {
Err = malformedError("offset plus size of cputype (" + Err = malformedError("offset plus size of cputype (" +
Twine(A.getCPUType()) + ") cpusubtype (" + Twine(A.getCPUType()) + ") cpusubtype (" +
Twine(A.getCPUSubType() & ~MachO::CPU_SUBTYPE_MASK) + Twine(A.getCPUSubType() & ~MachO::CPU_SUBTYPE_MASK) +
") extends past the end of the file"); ") extends past the end of the file");
return; return;
} }
#define MAXSECTALIGN 15 /* 2**15 or 0x8000 */
if (A.getAlign() > MAXSECTALIGN) { if (A.getAlign() > MaxSectionAlignment) {
Err = malformedError("align (2^" + Twine(A.getAlign()) + ") too large " Err = malformedError("align (2^" + Twine(A.getAlign()) +
"for cputype (" + Twine(A.getCPUType()) + ") cpusubtype (" + ") too large for cputype (" + Twine(A.getCPUType()) +
") cpusubtype (" +
Twine(A.getCPUSubType() & ~MachO::CPU_SUBTYPE_MASK) + Twine(A.getCPUSubType() & ~MachO::CPU_SUBTYPE_MASK) +
") (maximum 2^" + Twine(MAXSECTALIGN) + ")"); ") (maximum 2^" + Twine(MaxSectionAlignment) + ")");
compnerdUnsubmitted
Done
ReplyInline Actions

Personally, I would have split the changes in this file and in MachOUniversal.h into a separate change. That change is a very simple change that could probably merged immediately.

compnerd: Personally, I would have split the changes in this file and in `MachOUniversal.h` into a…
return; return;
} }
if(A.getOffset() % (1 << A.getAlign()) != 0){ if(A.getOffset() % (1 << A.getAlign()) != 0){
Err = malformedError("offset: " + Twine(A.getOffset()) + Err = malformedError("offset: " + Twine(A.getOffset()) +
" for cputype (" + Twine(A.getCPUType()) + ") cpusubtype (" + " for cputype (" + Twine(A.getCPUType()) + ") cpusubtype (" +
Twine(A.getCPUSubType() & ~MachO::CPU_SUBTYPE_MASK) + Twine(A.getCPUSubType() & ~MachO::CPU_SUBTYPE_MASK) +
") not aligned on it's alignment (2^" + Twine(A.getAlign()) + ")"); ") not aligned on it's alignment (2^" + Twine(A.getAlign()) + ")");
return; return;
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines

llvm/test/tools/llvm-lipo/Inputs/CPU10-slice.yaml

  • This file was added.
--- !mach-o
compnerdUnsubmitted
Done
ReplyInline Actions

CPU10 is not particularly helpful. Would be nice to use the human readable form (m88k).

compnerd: CPU10 is not particularly helpful. Would be nice to use the human readable form (m88k).
anushabasanaAuthorUnsubmitted
Done
ReplyInline Actions

This file and CPU14 are both intended to go into calculateSegmentAlignment() since they are not any of the valid architectures. I just manually changes the CPU types for testing. What would the best naming convention be for this situation?

anushabasana: This file and CPU14 are both intended to go into calculateSegmentAlignment() since they are not…
FileHeader:
magic: 0xFEEDFACF
cputype: 0x0000000A
cpusubtype: 0x80000003
filetype: 0x00000001
ncmds: 15
sizeofcmds: 1216
flags: 0x00200085
reserved: 0x00000000
LoadCommands:
- cmd: LC_SEGMENT_64
cmdsize: 72
segname: __PAGEZERO
vmaddr: 0
vmsize: 4294967296
fileoff: 0
filesize: 0
maxprot: 0
initprot: 0
nsects: 0
flags: 0
- cmd: LC_SEGMENT_64
cmdsize: 472
segname: __TEXT
vmaddr: 4294967296
vmsize: 4096
fileoff: 0
filesize: 4096
maxprot: 7
initprot: 5
nsects: 5
flags: 0
Sections:
- sectname: __text
segname: __TEXT
addr: 0x0000000100000F00
size: 133
offset: 0x00000F00
align: 4
reloff: 0x00000000
nreloc: 0
flags: 0x80000400
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __stubs
segname: __TEXT
addr: 0x0000000100000F86
size: 6
offset: 0x00000F86
align: 1
reloff: 0x00000000
nreloc: 0
flags: 0x80000408
reserved1: 0x00000000
reserved2: 0x00000006
reserved3: 0x00000000
- sectname: __stub_helper
segname: __TEXT
addr: 0x0000000100000F8C
size: 26
offset: 0x00000F8C
align: 2
reloff: 0x00000000
nreloc: 0
flags: 0x80000400
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __cstring
segname: __TEXT
addr: 0x0000000100000FA6
size: 10
offset: 0x00000FA6
align: 0
reloff: 0x00000000
nreloc: 0
flags: 0x00000002
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __unwind_info
segname: __TEXT
addr: 0x0000000100000FB0
size: 72
offset: 0x00000FB0
align: 2
reloff: 0x00000000
nreloc: 0
flags: 0x00000000
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- cmd: LC_SEGMENT_64
cmdsize: 232
segname: __DATA
vmaddr: 4294971392
vmsize: 4096
fileoff: 4096
filesize: 4096
maxprot: 7
initprot: 3
nsects: 2
flags: 0
Sections:
- sectname: __nl_symbol_ptr
segname: __DATA
addr: 0x0000000100001000
size: 16
offset: 0x00001000
align: 3
reloff: 0x00000000
nreloc: 0
flags: 0x00000006
reserved1: 0x00000001
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __la_symbol_ptr
segname: __DATA
addr: 0x0000000100001010
size: 8
offset: 0x00001010
align: 3
reloff: 0x00000000
nreloc: 0
flags: 0x00000007
reserved1: 0x00000003
reserved2: 0x00000000
reserved3: 0x00000000
- cmd: LC_SEGMENT_64
cmdsize: 72
segname: __LINKEDIT
vmaddr: 4294975488
vmsize: 4096
fileoff: 8192
filesize: 280
maxprot: 7
initprot: 1
nsects: 0
flags: 0
- cmd: LC_DYLD_INFO_ONLY
cmdsize: 48
rebase_off: 8192
rebase_size: 8
bind_off: 8200
bind_size: 24
weak_bind_off: 0
weak_bind_size: 0
lazy_bind_off: 8224
lazy_bind_size: 16
export_off: 8240
export_size: 64
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 8312
nsyms: 5
stroff: 8408
strsize: 64
- cmd: LC_DYSYMTAB
cmdsize: 80
ilocalsym: 0
nlocalsym: 0
iextdefsym: 0
nextdefsym: 3
iundefsym: 3
nundefsym: 2
tocoff: 0
ntoc: 0
modtaboff: 0
nmodtab: 0
extrefsymoff: 0
nextrefsyms: 0
indirectsymoff: 8392
nindirectsyms: 4
extreloff: 0
nextrel: 0
locreloff: 0
nlocrel: 0
- cmd: LC_LOAD_DYLINKER
cmdsize: 32
name: 12
PayloadString: /usr/lib/dyld
ZeroPadBytes: 7
- cmd: LC_UUID
cmdsize: 24
uuid: D01A2A5D-F96C-326A-80C7-FAD7D4023E07
- cmd: LC_BUILD_VERSION
cmdsize: 32
platform: 1
minos: 658944
sdk: 658944
ntools: 1
Tools:
- tool: 3
version: 29491968
- cmd: LC_SOURCE_VERSION
cmdsize: 16
version: 0
- cmd: LC_MAIN
cmdsize: 24
entryoff: 3904
stacksize: 0
- cmd: LC_LOAD_DYLIB
cmdsize: 56
dylib:
name: 24
timestamp: 2
current_version: 82115073
compatibility_version: 65536
PayloadString: /usr/lib/libSystem.B.dylib
ZeroPadBytes: 6
- cmd: LC_FUNCTION_STARTS
cmdsize: 16
dataoff: 8304
datasize: 8
- cmd: LC_DATA_IN_CODE
cmdsize: 16
dataoff: 8312
datasize: 0
LinkEditData:
RebaseOpcodes:
- Opcode: REBASE_OPCODE_SET_TYPE_IMM
Imm: 1
- Opcode: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
Imm: 2
ExtraData:
- 0x0000000000000010
- Opcode: REBASE_OPCODE_DO_REBASE_IMM_TIMES
Imm: 1
- Opcode: REBASE_OPCODE_DONE
Imm: 0
BindOpcodes:
- Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
Imm: 1
Symbol: ''
- Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
Imm: 0
Symbol: dyld_stub_binder
- Opcode: BIND_OPCODE_SET_TYPE_IMM
Imm: 1
Symbol: ''
- Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
Imm: 2
ULEBExtraData:
- 0x0000000000000000
Symbol: ''
- Opcode: BIND_OPCODE_DO_BIND
Imm: 0
Symbol: ''
- Opcode: BIND_OPCODE_DONE
Imm: 0
Symbol: ''
LazyBindOpcodes:
- Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
Imm: 2
ULEBExtraData:
- 0x0000000000000010
Symbol: ''
- Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
Imm: 1
Symbol: ''
- Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
Imm: 0
Symbol: _printf
- Opcode: BIND_OPCODE_DO_BIND
Imm: 0
Symbol: ''
- Opcode: BIND_OPCODE_DONE
Imm: 0
Symbol: ''
- Opcode: BIND_OPCODE_DONE
Imm: 0
Symbol: ''
- Opcode: BIND_OPCODE_DONE
Imm: 0
Symbol: ''
ExportTrie:
TerminalSize: 0
NodeOffset: 0
Name: ''
Flags: 0x0000000000000000
Address: 0x0000000000000000
Other: 0x0000000000000000
ImportName: ''
Children:
- TerminalSize: 0
NodeOffset: 5
Name: _
Flags: 0x0000000000000000
Address: 0x0000000000000000
Other: 0x0000000000000000
ImportName: ''
Children:
- TerminalSize: 2
NodeOffset: 31
Name: _mh_execute_header
Flags: 0x0000000000000000
Address: 0x0000000000000000
Other: 0x0000000000000000
ImportName: ''
- TerminalSize: 0
NodeOffset: 35
Name: ma
Flags: 0x0000000000000000
Address: 0x0000000000000000
Other: 0x0000000000000000
ImportName: ''
Children:
- TerminalSize: 3
NodeOffset: 48
Name: ximum
Flags: 0x0000000000000000
Address: 0x0000000000000F00
Other: 0x0000000000000000
ImportName: ''
- TerminalSize: 3
NodeOffset: 53
Name: in
Flags: 0x0000000000000000
Address: 0x0000000000000F40
Other: 0x0000000000000000
ImportName: ''
NameList:
- n_strx: 2
n_type: 0x0F
n_sect: 1
n_desc: 16
n_value: 4294967296
- n_strx: 22
n_type: 0x0F
n_sect: 1
n_desc: 0
n_value: 4294971200
- n_strx: 28
n_type: 0x0F
n_sect: 1
n_desc: 0
n_value: 4294971136
- n_strx: 37
n_type: 0x01
n_sect: 0
n_desc: 256
n_value: 0
- n_strx: 45
n_type: 0x01
n_sect: 0
n_desc: 256
n_value: 0
StringTable:
- ' '
- __mh_execute_header
- _main
- _maximum
- _printf
- dyld_stub_binder
- ''
- ''
...

llvm/test/tools/llvm-lipo/Inputs/CPU14-slice.yaml

  • This file was added.
--- !mach-o
compnerdUnsubmitted
Done
ReplyInline Actions

Similar for the file name

compnerd: Similar for the file name
FileHeader:
magic: 0xFEEDFACE
cputype: 0x0000000e
cpusubtype: 0x00000003
filetype: 0x00000001
ncmds: 4
sizeofcmds: 312
flags: 0x00002000
LoadCommands:
- cmd: LC_SEGMENT
cmdsize: 192
segname: ''
vmaddr: 0
vmsize: 72
fileoff: 340
filesize: 72
maxprot: 7
initprot: 7
nsects: 2
flags: 0
Sections:
- sectname: __text
segname: __TEXT
addr: 0x0000000000000000
size: 18
offset: 0x00000154
align: 4
reloff: 0x00000000
nreloc: 0
flags: 0x80000400
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- sectname: __eh_frame
segname: __TEXT
addr: 0x0000000000000014
size: 52
offset: 0x00000168
align: 2
reloff: 0x00000000
nreloc: 0
flags: 0x6800000B
reserved1: 0x00000000
reserved2: 0x00000000
reserved3: 0x00000000
- cmd: LC_VERSION_MIN_MACOSX
cmdsize: 16
version: 656384
sdk: 0
- cmd: LC_SYMTAB
cmdsize: 24
symoff: 412
nsyms: 1
stroff: 424
strsize: 8
- cmd: LC_DYSYMTAB
cmdsize: 80
ilocalsym: 0
nlocalsym: 0
iextdefsym: 0
nextdefsym: 1
iundefsym: 1
nundefsym: 0
tocoff: 0
ntoc: 0
modtaboff: 0
nmodtab: 0
extrefsymoff: 0
nextrefsyms: 0
indirectsymoff: 0
nindirectsyms: 0
extreloff: 0
nextrel: 0
locreloff: 0
nlocrel: 0
LinkEditData:
NameList:
- n_strx: 1
n_type: 0x0F
n_sect: 1
n_desc: 0
n_value: 0
StringTable:
- ''
- _main
- ''
...

llvm/test/tools/llvm-lipo/create-compute-alignment.test

  • This file was added.
# RUN: yaml2obj %p/Inputs/i386-slice.yaml > %t-i386.o
# RUN: yaml2obj %p/Inputs/CPU14-slice.yaml > %t-CPU14.o
# RUN: yaml2obj %p/Inputs/CPU10-slice.yaml > %t-CPU10.o
# RUN: llvm-lipo %t-i386.o %t-CPU14.o %t-CPU10.o -create -output %t-universal.o
# RUN: llvm-objdump %t-universal.o -m --universal-headers | FileCheck %s
# CHECK: fat_magic FAT_MAGIC
# CHECK: nfat_arch 3
# CHECK: architecture
# CHECK: cputype (10)
# CHECK: offset 72
# CHECK: align 2^3 (8)
# CHECK: architecture
# CHECK: cputype (14)
# CHECK: offset 8544
# CHECK: align 2^4 (16)
# CHECK: architecture i386
# CHECK: offset 12288
# CHECK: align 2^12 (4096)

llvm/test/tools/llvm-lipo/create-default-alignment.test

  • This file was moved from llvm/test/tools/llvm-lipo/create-without-alignment.test.
# RUN: yaml2obj %p/Inputs/i386-slice.yaml > %t-i386.o # RUN: yaml2obj %p/Inputs/i386-slice.yaml > %t-i386.o
# RUN: yaml2obj %p/Inputs/x86_64-slice.yaml > %t-x86_64.o # RUN: yaml2obj %p/Inputs/x86_64-slice.yaml > %t-x86_64.o
# RUN: llvm-lipo %t-i386.o %t-x86_64.o -create -output %t-universal-llvm.o # RUN: llvm-lipo %t-i386.o %t-x86_64.o -create -output %t-universal-llvm.o
# RUN: yaml2obj %p/Inputs/i386-x86_64-universal.yaml > %t-universal.o # RUN: yaml2obj %p/Inputs/i386-x86_64-universal.yaml > %t-universal.o
# RUN: cmp %t-universal-llvm.o %t-universal.o # RUN: cmp %t-universal-llvm.o %t-universal.o
# RUN: yaml2obj %p/Inputs/armv7-slice.yaml > %t-armv7.o # RUN: yaml2obj %p/Inputs/armv7-slice.yaml > %t-armv7.o
# RUN: yaml2obj %p/Inputs/arm64-slice.yaml > %t-arm64.o # RUN: yaml2obj %p/Inputs/arm64-slice.yaml > %t-arm64.o
# RUN: llvm-lipo %t-arm64.o %t-armv7.o %t-universal.o -create -output %t-universal-2.o # RUN: llvm-lipo %t-arm64.o %t-armv7.o %t-universal.o -create -output %t-universal-2.o
# RUN: llvm-lipo %t-universal-2.o -thin x86_64 -output %t-x86_64_extracted.o # RUN: llvm-lipo %t-universal-2.o -thin x86_64 -output %t-x86_64_extracted.o
# RUN: cmp %t-x86_64_extracted.o %t-x86_64.o # RUN: cmp %t-x86_64_extracted.o %t-x86_64.o
# RUN: llvm-lipo %t-universal-2.o -thin armv7 -output %t-armv7-extracted.o # RUN: llvm-lipo %t-universal-2.o -thin armv7 -output %t-armv7-extracted.o
# RUN: cmp %t-armv7-extracted.o %t-armv7.o # RUN: cmp %t-armv7-extracted.o %t-armv7.o
# RUN: llvm-objdump %t-universal-2.o -m --universal-headers | FileCheck %s # RUN: llvm-objdump %t-universal-2.o -m --universal-headers | FileCheck %s
# CHECK: fat_magic FAT_MAGIC # CHECK: fat_magic FAT_MAGIC
# CHECK: nfat_arch 4 # CHECK: nfat_arch 4
# CHECK: architecture i386 # CHECK: architecture i386
# CHECK: offset 4096 # CHECK: offset 4096
# CHECK: align 2^12 (4096) # CHECK: align 2^12 (4096)
# CHECK: architecture x86_64 # CHECK: architecture x86_64
# CHECK: offset 8192 # CHECK: offset 8192
# CHECK: align 2^12 (4096) # CHECK: align 2^12 (4096)
# CHECK: architecture armv7 # CHECK: architecture armv7
# CHECK: offset 16384 # CHECK: offset 16384
# CHECK: align 2^14 (16384) # CHECK: align 2^14 (16384)
# CHECK: architecture arm64 # CHECK: architecture arm64
# CHECK: offset 32768 # CHECK: offset 32768
# CHECK: align 2^14 (16384) # CHECK: align 2^14 (16384)

llvm/test/tools/llvm-lipo/create-without-alignment.test

  • This file was moved to llvm/test/tools/llvm-lipo/create-default-alignment.test.

llvm/tools/llvm-lipo/llvm-lipo.cpp

Show First 20 Lines • Show All 340 Lines • ▼ Show 20 Lines for (const auto &S : Slices) {
if (!Entry.second) if (!Entry.second)
reportError(Entry.first->second->getFileName() + " and " + reportError(Entry.first->second->getFileName() + " and " +
S.ObjectFile->getFileName() + " have the same architecture " + S.ObjectFile->getFileName() + " have the same architecture " +
getArchString(*S.ObjectFile) + getArchString(*S.ObjectFile) +
" and therefore cannot be in the same universal binary"); " and therefore cannot be in the same universal binary");
} }
} }
static uint32_t calculateAlignment(const MachOObjectFile *ObjectFile) { // For compatibility with cctools lipo, alignment is calculated as the minimum
// TODO: Implement getAlign() and remove hard coding // aligment of all load commands. Each load command's alignment is the maximum
compnerdUnsubmitted
Done
ReplyInline Actions

ITYM segment instead of all load commands. The alignment of something like LC_REEXPORT_DYLIB seems irrelevant to this or am I mistaken on that?

compnerd: ITYM segment instead of all load commands. The alignment of something like `LC_REEXPORT_DYLIB`…
// Will be implemented in a follow-up. // alignment from its sections
static uint32_t calculateSegmentAlignment(const MachOObjectFile *ObjectFile) {
alexander-shaposhnikovUnsubmitted
Done
ReplyInline Actions

const MachOObjectFile *ObjectFile -> const MachOObjectFile &O

alexander-shaposhnikov: const MachOObjectFile *ObjectFile -> const MachOObjectFile &O
uint32_t P2CurrentAlignment;
uint32_t P2MinAlignment = MachOUniversalBinary::MaxSectionAlignment;
bool Is64Bit = ObjectFile->is64Bit();
alexander-shaposhnikovUnsubmitted
Done
ReplyInline Actions

const bool

alexander-shaposhnikov: const bool
for (const auto &LC : ObjectFile->load_commands()) {
if (LC.C.cmd != (Is64Bit ? MachO::LC_SEGMENT_64 : MachO::LC_SEGMENT))
continue;
if (ObjectFile->getHeader().filetype == MachO::MH_OBJECT) {
unsigned NumberOfSections =
(Is64Bit ? ObjectFile->getSegment64LoadCommand(LC).nsects
: ObjectFile->getSegmentLoadCommand(LC).nsects);
P2CurrentAlignment = NumberOfSections ? 2 : P2MinAlignment;
for (unsigned SI = 0; SI < NumberOfSections; ++SI) {
P2CurrentAlignment =
std::max(P2CurrentAlignment,
(Is64Bit ? ObjectFile->getSection64(LC, SI).align
: ObjectFile->getSection(LC, SI).align));
}
} else {
P2CurrentAlignment = countTrailingZeros(
Is64Bit ? ObjectFile->getSegment64LoadCommand(LC).vmaddr
: ObjectFile->getSegmentLoadCommand(LC).vmaddr);
}
P2MinAlignment = std::min(P2MinAlignment, P2CurrentAlignment);
}
// return a value >= 4 byte aligned, and less than MachO MaxSectionAlignment
return std::max(
static_cast<uint32_t>(2),
std::min(P2MinAlignment, static_cast<uint32_t>(
MachOUniversalBinary::MaxSectionAlignment)));
}
// ARM alignment of 14 for compatibility with cctools lipo static uint32_t calculateAlignment(const MachOObjectFile *ObjectFile) {
switch (ObjectFile->getHeader().cputype) { switch (ObjectFile->getHeader().cputype) {
case MachO::CPU_TYPE_I386:
case MachO::CPU_TYPE_X86_64:
case MachO::CPU_TYPE_POWERPC:
case MachO::CPU_TYPE_POWERPC64:
return 12; // log2 value of page size(4k) for x86 and PPC
case MachO::CPU_TYPE_ARM: case MachO::CPU_TYPE_ARM:
case MachO::CPU_TYPE_ARM64: case MachO::CPU_TYPE_ARM64:
case MachO::CPU_TYPE_ARM64_32: case MachO::CPU_TYPE_ARM64_32:
return 14; return 14; // log2 value of page size(16k) for Darwin ARM
default: default:
return 12; return calculateSegmentAlignment(ObjectFile);
} }
} }
// This function replicates ordering from cctools lipo for consistency // This function replicates ordering from cctools lipo for consistency
static bool compareSlices(const Slice &Lhs, const Slice &Rhs) { static bool compareSlices(const Slice &Lhs, const Slice &Rhs) {
if (Lhs.ObjectFile->getHeader().cputype == if (Lhs.ObjectFile->getHeader().cputype ==
Rhs.ObjectFile->getHeader().cputype) Rhs.ObjectFile->getHeader().cputype)
return Lhs.ObjectFile->getHeader().cpusubtype < return Lhs.ObjectFile->getHeader().cpusubtype <
▲ Show 20 Lines • Show All 149 Lines • Show Last 20 Lines
llvm/test/tools/llvm-lipo/Inputs/CPU14-slice.yaml