Skip to content

Use LLVM patch to correct alignments for i128 and u128 #113880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Use LLVM patch to correct alignments for i128 and u128 #113880

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59e8969
Use rustc with patch that corrects alignment
tgross35 Jul 20, 2023
c742908
Remove lint_improper_ctypes_128bit lint
tgross35 Jul 20, 2023
2e5b2e5
Change to new branch with register spilling fixed
tgross35 Aug 17, 2023
e9aa0d4
Update test output
tgross35 Aug 17, 2023
95fb782
Update submodule
tgross35 Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
url = https://github.com/rust-lang/edition-guide.git
[submodule "src/llvm-project"]
path = src/llvm-project
url = https://github.com/rust-lang/llvm-project.git
branch = rustc/16.0-2023-06-05
url = https://github.com/tgross35/llvm-project.git
branch = rustc/16.0-2023-06-05-i128-patch
[submodule "src/doc/embedded-book"]
path = src/doc/embedded-book
url = https://github.com/rust-embedded/book.git
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_abi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ impl TargetDataLayout {
16 => dl.i16_align = a,
32 => dl.i32_align = a,
64 => dl.i64_align = a,
128 => dl.i128_align = a,
_ => {}
}
if bits >= i128_align_src && bits <= 128 {
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_ast/src/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3189,9 +3189,9 @@ mod size_asserts {
static_assert_size!(Impl, 136);
static_assert_size!(Item, 136);
static_assert_size!(ItemKind, 64);
static_assert_size!(LitKind, 24);
// static_assert_size!(LitKind, 32);
static_assert_size!(Local, 72);
static_assert_size!(MetaItemLit, 40);
// static_assert_size!(MetaItemLit, 48);
static_assert_size!(Param, 40);
static_assert_size!(Pat, 72);
static_assert_size!(Path, 24);
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ pub fn target() -> Target {
Target {
llvm_target: "x86_64-unknown-linux-gnu".into(),
pointer_width: 64,
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:\
64-i128:128-f80:128-n8:16:32:64-S128"
.into(),
arch: "x86_64".into(),
options: base,
Expand Down
14 changes: 14 additions & 0 deletions rust-alignment-check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
use std::mem::{align_of, size_of};

#[repr(C)]
struct Struct1 {
a: u8,
b: u128,
c: i128,
}

fn main() {
println!("i128 size {} align {}", size_of::<i128>(), align_of::<i128>());
println!("u128 size {} align {}", size_of::<u128>(), align_of::<u128>());
println!("Struct1 size {} align {}", size_of::<Struct1>(), align_of::<Struct1>());
}
2 changes: 1 addition & 1 deletion src/llvm-project
Open in desktop
Submodule llvm-project updated 46 files
+3,454 −0 D86310.diff
+6 −0 clang/docs/ReleaseNotes.rst
+2 −2 clang/lib/Basic/Targets/OSTargets.h
+22 −21 clang/lib/Basic/Targets/X86.h
+4 −1 clang/lib/Driver/ToolChains/WebAssembly.cpp
+8 −8 clang/test/CodeGen/target-data.c
+26 −0 clang/test/Driver/wasm-toolchain.c
+18 −2 llvm/lib/IR/AutoUpgrade.cpp
+0 −7 llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
+4 −2 llvm/lib/Target/X86/X86TargetMachine.cpp
+1 −1 llvm/test/Bitcode/upgrade-datalayout.ll
+1 −1 llvm/test/Bitcode/upgrade-datalayout3.ll
+1 −1 llvm/test/Bitcode/upgrade-datalayout4.ll
+4 −4 llvm/test/CodeGen/X86/AMX/amx-config.ll
+2 −2 llvm/test/CodeGen/X86/arg-copy-elide.ll
+13 −22 llvm/test/CodeGen/X86/atomic-idempotent.ll
+105 −61 llvm/test/CodeGen/X86/atomic-non-integer.ll
+4 −4 llvm/test/CodeGen/X86/atomic-unordered.ll
+8 −8 llvm/test/CodeGen/X86/atomic128.ll
+11 −11 llvm/test/CodeGen/X86/avx512fp16-cvt.ll
+1 −1 llvm/test/CodeGen/X86/bitcast-i256.ll
+1 −1 llvm/test/CodeGen/X86/catchpad-dynamic-alloca.ll
+8 −24 llvm/test/CodeGen/X86/fp-intrinsics.ll
+4 −4 llvm/test/CodeGen/X86/fp128-cast-strict.ll
+13 −13 llvm/test/CodeGen/X86/fp128-cast.ll
+100 −300 llvm/test/CodeGen/X86/fp128-libcalls-strict.ll
+80 −240 llvm/test/CodeGen/X86/fp128-libcalls.ll
+12 −12 llvm/test/CodeGen/X86/fptosi-sat-scalar.ll
+4 −4 llvm/test/CodeGen/X86/fptoui-sat-scalar.ll
+8 −11 llvm/test/CodeGen/X86/implicit-null-check.ll
+1 −1 llvm/test/CodeGen/X86/osx-private-labels.ll
+21 −21 llvm/test/CodeGen/X86/scheduler-backtracking.ll
+2 −2 llvm/test/CodeGen/X86/sdiv_fix.ll
+2 −2 llvm/test/CodeGen/X86/sdiv_fix_sat.ll
+24 −32 llvm/test/CodeGen/X86/setcc-wide-types.ll
+2 −2 llvm/test/CodeGen/X86/smul-with-overflow.ll
+2 −1 llvm/test/CodeGen/X86/sret-implicit.ll
+38 −72 llvm/test/CodeGen/X86/statepoint-deopt-lowering.ll
+2 −2 llvm/test/CodeGen/X86/statepoint-vector.ll
+2 −2 llvm/test/CodeGen/X86/udiv_fix.ll
+2 −2 llvm/test/CodeGen/X86/udiv_fix_sat.ll
+1 −1 llvm/test/tools/llvm-lto2/X86/pipeline.ll
+1 −1 llvm/test/tools/llvm-lto2/X86/slp-vectorize-pm.ll
+1 −1 llvm/test/tools/llvm-lto2/X86/stats-file-option.ll
+7 −5 llvm/unittests/Bitcode/DataLayoutUpgradeTest.cpp
+4 −4 llvm/unittests/CodeGen/InstrRefLDVTest.cpp