diff options
| author | Denys Zariaiev <denys.zariaiev@gmail.com> | 2019-01-27 23:52:22 +0100 |
|---|---|---|
| committer | Denys Zariaiev <denys.zariaiev@gmail.com> | 2019-01-28 01:16:32 +0100 |
| commit | ceacde31aeac4732a970ba253a99502b5d9f5280 (patch) | |
| tree | 0be86f2a86fe95d0ff1f92e9743b58be33c483b6 | |
| parent | 97c8e82fe03c079368e7913c46f6b26fefa30150 (diff) | |
| download | rust-ceacde31aeac4732a970ba253a99502b5d9f5280.tar.gz rust-ceacde31aeac4732a970ba253a99502b5d9f5280.zip | |
NVPTX: by-default use target cpu "sm_30"
| -rw-r--r-- | src/ci/docker/nvptx-cuda/Dockerfile | 2 | ||||
| -rw-r--r-- | src/librustc_target/spec/nvptx64_nvidia_cuda.rs | 6 | ||||
| -rw-r--r-- | src/test/run-make/nvptx-emit-asm/kernel.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/docker/nvptx-cuda/Dockerfile b/src/ci/docker/nvptx-cuda/Dockerfile index cdb1f565bd2..b52865ced3e 100644 --- a/src/ci/docker/nvptx-cuda/Dockerfile +++ b/src/ci/docker/nvptx-cuda/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get install -y --no-install-recommends \ g++ make file curl ca-certificates python git \ cmake sudo gdb -# TODO(denzp): setup `ptx-linker` CI for auttomatic binary releases. +# FIXME: setup `ptx-linker` CI for automatic binary releases. RUN curl -sL https://github.com/denzp/rust-ptx-linker/releases/download/v0.9.0-alpha/rust-ptx-linker.linux64.tar.gz | \ tar -xzvC /usr/bin diff --git a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs index ed5d0f24506..e8512415e66 100644 --- a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs +++ b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs @@ -22,9 +22,9 @@ pub fn target() -> TargetResult { linker: Some("rust-ptx-linker".to_string()), // With `ptx-linker` approach, it can be later overriden via link flags. - cpu: "sm_20".to_string(), + cpu: "sm_30".to_string(), - // TODO(denzp): create tests for the atomics. + // FIXME: create tests for the atomics. max_atomic_width: Some(64), // Unwinding on CUDA is neither feasible nor useful. @@ -51,7 +51,7 @@ pub fn target() -> TargetResult { // This behavior is not supported by PTX ISA. merge_functions: MergeFunctions::Disabled, - // TODO(denzp): enable compilation tests for the target and + // FIXME: enable compilation tests for the target and // create the tests for this. abi_blacklist: vec![ Abi::Cdecl, diff --git a/src/test/run-make/nvptx-emit-asm/kernel.rs b/src/test/run-make/nvptx-emit-asm/kernel.rs index 070a6efd2d5..b71e18d9103 100644 --- a/src/test/run-make/nvptx-emit-asm/kernel.rs +++ b/src/test/run-make/nvptx-emit-asm/kernel.rs @@ -3,7 +3,7 @@ #![feature(abi_ptx)] // Verify the default CUDA arch. -// CHECK: .target sm_20 +// CHECK: .target sm_30 // CHECK: .address_size 64 // Verify function name doesn't contain unacceaptable characters. |