From 584994774ee2ceff16d835c5fa1337a98d3f7bc9 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Sat, 28 Sep 2024 17:57:06 -0400
Subject: [PATCH] Resolve FIXMEs related to `f16` assembly

We have a couple FIXMEs from before aarch64 `f16` assembly support
existed. We have this available now, so resolve the notes here.
---
 testcrate/benches/float_extend.rs |  7 ++-----
 testcrate/benches/float_trunc.rs  | 14 +++++---------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/testcrate/benches/float_extend.rs b/testcrate/benches/float_extend.rs
index a9563741..a0cdaf48 100644
--- a/testcrate/benches/float_extend.rs
+++ b/testcrate/benches/float_extend.rs
@@ -15,11 +15,10 @@ float_bench! {
     sys_available: not(feature = "no-sys-f16"),
     asm: [
         #[cfg(target_arch = "aarch64")] {
-            // FIXME(f16_f128): remove `to_bits()` after f16 asm support (rust-lang/rust/#116909)
             let ret: f32;
             asm!(
                 "fcvt    {ret:s}, {a:h}",
-                a = in(vreg) a.to_bits(),
+                a = in(vreg) a,
                 ret = lateout(vreg) ret,
                 options(nomem, nostack, pure),
             );
@@ -96,9 +95,7 @@ pub fn float_extend() {
         extend_f16_f32(&mut criterion);
 
         #[cfg(f128_enabled)]
-        {
-            extend_f16_f128(&mut criterion);
-        }
+        extend_f16_f128(&mut criterion);
     }
 
     extend_f32_f64(&mut criterion);
diff --git a/testcrate/benches/float_trunc.rs b/testcrate/benches/float_trunc.rs
index 8d874e4b..de9b5bf8 100644
--- a/testcrate/benches/float_trunc.rs
+++ b/testcrate/benches/float_trunc.rs
@@ -14,8 +14,7 @@ float_bench! {
     sys_available: not(feature = "no-sys-f16"),
     asm: [
         #[cfg(target_arch = "aarch64")] {
-            // FIXME(f16_f128): remove `from_bits()` after f16 asm support (rust-lang/rust/#116909)
-            let ret: u16;
+            let ret: f16;
             asm!(
                 "fcvt    {ret:h}, {a:s}",
                 a = in(vreg) a,
@@ -23,7 +22,7 @@ float_bench! {
                 options(nomem, nostack, pure),
             );
 
-            f16::from_bits(ret)
+            ret
         };
     ],
 }
@@ -37,8 +36,7 @@ float_bench! {
     sys_available: not(feature = "no-sys-f16"),
     asm: [
         #[cfg(target_arch = "aarch64")] {
-            // FIXME(f16_f128): remove `from_bits()` after f16 asm support (rust-lang/rust/#116909)
-            let ret: u16;
+            let ret: f16;
             asm!(
                 "fcvt    {ret:h}, {a:d}",
                 a = in(vreg) a,
@@ -46,7 +44,7 @@ float_bench! {
                 options(nomem, nostack, pure),
             );
 
-            f16::from_bits(ret)
+            ret
         };
     ],
 }
@@ -138,9 +136,7 @@ pub fn float_trunc() {
         // FIXME(#655): `f16` tests disabled until we can bootstrap symbols
         #[cfg(f16_enabled)]
         #[cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))]
-        {
-            trunc_f128_f16(&mut criterion);
-        }
+        trunc_f128_f16(&mut criterion);
 
         trunc_f128_f32(&mut criterion);
         trunc_f128_f64(&mut criterion);