Merge pull request rust-lang#2658 from rust-lang/rustc-pull

Rustc pull update

Author: tshepang

rust-version

@@ -1 +1 @@
-d3e1ccdf40ae7b7a6dc81edc073d80dad7b66f75
+1be6b13be73dc12e98e51b403add4c41a0b77759

src/offload/usage.md

@@ -5,13 +5,16 @@ We currently work on launching the following Rust kernel on the GPU. To follow a
 
 ```rust
 #![feature(abi_gpu_kernel)]
+#![feature(rustc_attrs)]
+#![feature(core_intrinsics)]
 #![no_std]
 
 #[cfg(target_os = "linux")]
 extern crate libc;
 #[cfg(target_os = "linux")]
 use libc::c_char;
 
+#[cfg(target_os = "linux")]
 use core::mem;
 
 #[panic_handler]
@@ -38,7 +41,7 @@ fn main() {
     }
 
     unsafe {
-        kernel_1(array_c);
+        kernel(array_c);
     }
     core::hint::black_box(&array_c);
     unsafe {
@@ -52,6 +55,11 @@ fn main() {
     }
 }
 
+#[inline(never)]
+unsafe fn kernel(x: *mut [f64; 256]) {
+    core::intrinsics::offload(kernel_1, (x,))
+}
+
 #[cfg(target_os = "linux")]
 unsafe extern "C" {
     pub fn kernel_1(array_b: *mut [f64; 256]);
@@ -60,6 +68,7 @@ unsafe extern "C" {
 #[cfg(not(target_os = "linux"))]
 #[unsafe(no_mangle)]
 #[inline(never)]
+#[rustc_offload_kernel]
 pub extern "gpu-kernel" fn kernel_1(x: *mut [f64; 256]) {
     unsafe { (*x)[0] = 21.0 };
 }