Skip to contentSkip to conversation

rust-target-config: Update the data layout for x86-64 target

PATCH In review [email protected] 2 participants 3 messages Oct 17, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rust-target-config: Update the data layout for x86-64 target

From: Deepesh Varatharajan <[email protected]>

The data layout for x86-64 target was different in rust from llvm.
It resulted in the following data layout error:
--------------------------------------------------------------------------------------
error: data-layout for target x86_64-linux, e-m:e-i64:64-f80:128-n8:16:32:64-S128, differs from LLVM target's x86_64-unknown-linux-gnu default layout, e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128
--------------------------------------------------------------------------------------

The issue was reported in meta-rust layer as:
https://github.com/meta-rust/meta-rust/pull/442

Hence, the data layout for x86-64 is modified as per the llvm sources which fixes the issue.

After running the testsuite with the modified data layout; it was observed that the "tests/codegen/i128-x86-align.rs" passed. The modified data layout fixed the scalar pair which resolved the testcase failure. Hence, the testcase has been removed from the exclude list.

---
 meta/classes-recipe/rust-target-config.bbclass | 2 +-
 meta/lib/oeqa/selftest/cases/rust.py           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
meta/classes-recipe/rust-target-config.bbclass +1 -1
index 334f2e7d5f..f7aa6c74d8 100644
@@ -153,7 +153,7 @@ TARGET_C_INT_WIDTH[aarch64] = "32"
 MAX_ATOMIC_WIDTH[aarch64] = "128"
 
 ## x86_64-unknown-linux-{gnu, musl}
-DATA_LAYOUT[x86_64] = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+DATA_LAYOUT[x86_64] = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
 TARGET_ENDIAN[x86_64] = "little"
 TARGET_POINTER_WIDTH[x86_64] = "64"
 TARGET_C_INT_WIDTH[x86_64] = "32"
meta/lib/oeqa/selftest/cases/rust.py +0 -1
index cbe6366f75..88d7bb9518 100644
@@ -83,7 +83,6 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase):
                             'src/tools/tidy/src/',
                             'tests/assembly/asm/aarch64-outline-atomics.rs',
                             'tests/codegen/abi-main-signature-32bit-c-int.rs',
-                            'tests/codegen/i128-x86-align.rs',
                             'tests/codegen/issues/issue-122805.rs',
                             'tests/codegen/thread-local.rs',
                             'tests/mir-opt/',
Signature · 1 line
2.43.0
#1 lore raw

This patch is ok, any rust version using clang 18 or newer will need this.

Quoted 63 lines · Deepesh via lists.openembedded.org

From: Deepesh Varatharajan <[email protected]>

The data layout for x86-64 target was different in rust from llvm.
It resulted in the following data layout error:
--------------------------------------------------------------------------------------
error: data-layout for target x86_64-linux, e-m:e-i64:64-f80:128-n8:16:32:64-S128, differs from LLVM target's x86_64-unknown-linux-gnu default layout, e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128
--------------------------------------------------------------------------------------

The issue was reported in meta-rust layer as:
https://github.com/meta-rust/meta-rust/pull/442

Hence, the data layout for x86-64 is modified as per the llvm sources which fixes the issue.

After running the testsuite with the modified data layout; it was observed that the "tests/codegen/i128-x86-align.rs" passed. The modified data layout fixed the scalar pair which resolved the testcase failure. Hence, the testcase has been removed from the exclude list.

---
 meta/classes-recipe/rust-target-config.bbclass | 2 +-
 meta/lib/oeqa/selftest/cases/rust.py           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
meta/classes-recipe/rust-target-config.bbclass +1 -1
index 334f2e7d5f..f7aa6c74d8 100644
@@ -153,7 +153,7 @@ TARGET_C_INT_WIDTH[aarch64] = "32"
 MAX_ATOMIC_WIDTH[aarch64] = "128"
 
 ## x86_64-unknown-linux-{gnu, musl}
-DATA_LAYOUT[x86_64] = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+DATA_LAYOUT[x86_64] = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
 TARGET_ENDIAN[x86_64] = "little"
 TARGET_POINTER_WIDTH[x86_64] = "64"
 TARGET_C_INT_WIDTH[x86_64] = "32"
meta/lib/oeqa/selftest/cases/rust.py +0 -2
index cbe6366f75..88d7bb9518 100644
@@ -83,7 +83,6 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase):
                             'src/tools/tidy/src/',
                             'tests/assembly/asm/aarch64-outline-atomics.rs',
                             'tests/codegen/abi-main-signature-32bit-c-int.rs',
-                            'tests/codegen/i128-x86-align.rs',
                             'tests/codegen/issues/issue-122805.rs',
                             'tests/codegen/thread-local.rs',
                             'tests/mir-opt/',
--

2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#206017): https://lists.openembedded.org/g/openembedded-core/message/206017
Mute This Topic: https://lists.openembedded.org/mt/109062536/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw

This issue was first identified with Rust 1.78, when it updated to Clang 18. Since we are currently on Rust 1.79 in the master branch, we need to implement this change in master.

Get Outlook for Android<https://aka.ms/AAb9ysg>
________________________________
From: Khem Raj <[email protected]>
Sent: Thursday, October 17, 2024 9:32:23 PM
To: Varatharajan, Deepesh <[email protected]>
Cc: [email protected] <[email protected]>; Gowda, Naveen <[email protected]>; Moodalappa, Shivaprasad <[email protected]>; Kokkonda, Sundeep <[email protected]>
Subject: Re: [OE-core] [PATCH] rust-target-config: Update the data layout for x86-64 target

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

This patch is ok, any rust version using clang 18 or newer will need this.

Quoted 63 lines · Deepesh via lists.openembedded.org

From: Deepesh Varatharajan <[email protected]>

The data layout for x86-64 target was different in rust from llvm.
It resulted in the following data layout error:
--------------------------------------------------------------------------------------
error: data-layout for target x86_64-linux, e-m:e-i64:64-f80:128-n8:16:32:64-S128, differs from LLVM target's x86_64-unknown-linux-gnu default layout, e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128
--------------------------------------------------------------------------------------

The issue was reported in meta-rust layer as:
https://github.com/meta-rust/meta-rust/pull/442

Hence, the data layout for x86-64 is modified as per the llvm sources which fixes the issue.

After running the testsuite with the modified data layout; it was observed that the "tests/codegen/i128-x86-align.rs" passed. The modified data layout fixed the scalar pair which resolved the testcase failure. Hence, the testcase has been removed from the exclude list.

---
 meta/classes-recipe/rust-target-config.bbclass | 2 +-
 meta/lib/oeqa/selftest/cases/rust.py           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
meta/classes-recipe/rust-target-config.bbclass +1 -1
index 334f2e7d5f..f7aa6c74d8 100644
@@ -153,7 +153,7 @@ TARGET_C_INT_WIDTH[aarch64] = "32"
 MAX_ATOMIC_WIDTH[aarch64] = "128"
 
 ## x86_64-unknown-linux-{gnu, musl}
-DATA_LAYOUT[x86_64] = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+DATA_LAYOUT[x86_64] = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
 TARGET_ENDIAN[x86_64] = "little"
 TARGET_POINTER_WIDTH[x86_64] = "64"
 TARGET_C_INT_WIDTH[x86_64] = "32"
meta/lib/oeqa/selftest/cases/rust.py +0 -2
index cbe6366f75..88d7bb9518 100644
@@ -83,7 +83,6 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase):
                             'src/tools/tidy/src/',
                             'tests/assembly/asm/aarch64-outline-atomics.rs',
                             'tests/codegen/abi-main-signature-32bit-c-int.rs',
-                            'tests/codegen/i128-x86-align.rs',
                             'tests/codegen/issues/issue-122805.rs',
                             'tests/codegen/thread-local.rs',
                             'tests/mir-opt/',
--

2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#206017): https://lists.openembedded.org/g/openembedded-core/message/206017
Mute This Topic: https://lists.openembedded.org/mt/109062536/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-