about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-09-18 08:44:27 +0000
committerbors <bors@rust-lang.org>2022-09-18 08:44:27 +0000
commita29f341a8ac4e9325a5e37027b4215f50a76d06f (patch)
treebcee636a2492d4e92d62e0182a3646c7e1ef8e5f
parent4c2e500788cb3875f90eedb0791b76bcbb91d758 (diff)
parent335690200ef72899cd675f1ebb65d5d7a17dc29b (diff)
downloadrust-a29f341a8ac4e9325a5e37027b4215f50a76d06f.tar.gz
rust-a29f341a8ac4e9325a5e37027b4215f50a76d06f.zip
Auto merge of #101963 - scottmcm:from-ptr-range-optimization, r=Mark-Simulacrum
Add a codegen test for `slice::from_ptr_range`

I noticed back in #95579 that this didn't optimize as well as it should.

It's better now, after #95837 changed the code in `from_ptr_range` and https://github.com/llvm/llvm-project/issues/54824 was fixed in LLVM 15.

So here's a test to keep it generating the good version.
-rw-r--r--src/test/codegen/slice_as_from_ptr_range.rs23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/test/codegen/slice_as_from_ptr_range.rs b/src/test/codegen/slice_as_from_ptr_range.rs
new file mode 100644
index 00000000000..0e3fefd9728
--- /dev/null
+++ b/src/test/codegen/slice_as_from_ptr_range.rs
@@ -0,0 +1,23 @@
+// compile-flags: -O
+// only-64bit (because we're using [ui]size)
+// ignore-debug (because the assertions get in the way)
+// min-llvm-version: 15.0 (because this is a relatively new instcombine)
+
+#![crate_type = "lib"]
+#![feature(slice_from_ptr_range)]
+
+// This is intentionally using a non-power-of-two array length,
+// as that's where the optimization differences show up
+
+// CHECK-LABEL: @flatten_via_ptr_range
+#[no_mangle]
+pub fn flatten_via_ptr_range(slice_of_arrays: &[[i32; 13]]) -> &[i32] {
+    // CHECK-NOT: lshr
+    // CHECK-NOT: udiv
+    // CHECK: mul nuw nsw i64 %{{.+}}, 13
+    // CHECK-NOT: lshr
+    // CHECK-NOT: udiv
+    let r = slice_of_arrays.as_ptr_range();
+    let r = r.start.cast()..r.end.cast();
+    unsafe { core::slice::from_ptr_range(r) }
+}