Skip to content

Commit 184a9af

Browse files
DirrekeDirreke
committed
add details for csky-unknown-linux-gnuabiv2 and add docs
1 parent 9e5fb33 commit 184a9af

File tree

8 files changed

+145
-56
lines changed

8 files changed

+145
-56
lines changed

‎compiler/rustc_codegen_llvm/src/asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl<'ll, 'tcx> AsmBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
261261
InlineAsmArch::M68k => {
262262
constraints.push("~{ccr}".to_string());
263263
}
264-
InlineAsmArch::CSKY => {} // https://github.com/llvm/llvm-project/blob/8b76aea8d8b1b71f6220bc2845abc749f18a19b7/clang/lib/Basic/Targets/CSKY.h getClobers()
264+
InlineAsmArch::CSKY => {}
265265
}
266266
}
267267
if !options.contains(InlineAsmOptions::NOMEM) {

‎compiler/rustc_codegen_ssa/src/target_features.rs

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,50 @@ const WASM_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
297297
const BPF_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[("alu32", Some(sym::bpf_target_feature))];
298298

299299
const CSKY_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
300-
("hard-float", Some(sym::csky_target_feature)),
301-
("hard-float-abi", Some(sym::csky_target_feature)),
302-
("fpuv2_sf", Some(sym::csky_target_feature)),
300+
// tidy-alphabetical-start
301+
("10e60", Some(sym::csky_target_feature)),
302+
("2e3", Some(sym::csky_target_feature)),
303+
("3e3r1", Some(sym::csky_target_feature)),
304+
("3e3r2", Some(sym::csky_target_feature)),
305+
("3e3r3", Some(sym::csky_target_feature)),
306+
("3e7", Some(sym::csky_target_feature)),
307+
("7e10", Some(sym::csky_target_feature)),
308+
("cache", Some(sym::csky_target_feature)),
309+
("doloop", Some(sym::csky_target_feature)),
310+
("dsp1e2", Some(sym::csky_target_feature)),
311+
("dspe60", Some(sym::csky_target_feature)),
312+
("e1", Some(sym::csky_target_feature)),
313+
("e2", Some(sym::csky_target_feature)),
314+
("edsp", Some(sym::csky_target_feature)),
315+
("elrw", Some(sym::csky_target_feature)),
316+
("float1e2", Some(sym::csky_target_feature)),
317+
("float1e3", Some(sym::csky_target_feature)),
318+
("float3e4", Some(sym::csky_target_feature)),
319+
("float7e60", Some(sym::csky_target_feature)),
320+
("floate1", Some(sym::csky_target_feature)),
321+
("hard-tp", Some(sym::csky_target_feature)),
322+
("high-registers", Some(sym::csky_target_feature)),
323+
("hwdiv", Some(sym::csky_target_feature)),
324+
("mp", Some(sym::csky_target_feature)),
325+
("mp1e2", Some(sym::csky_target_feature)),
326+
("nvic", Some(sym::csky_target_feature)),
327+
("trust", Some(sym::csky_target_feature)),
328+
("vdsp2e60f", Some(sym::csky_target_feature)),
329+
("vdspv1", Some(sym::csky_target_feature)),
330+
("vdspv2", Some(sym::csky_target_feature)),
331+
// tidy-alphabetical-end
332+
//fpu
333+
// tidy-alphabetical-start
334+
("fdivdu", Some(sym::csky_target_feature)),
303335
("fpuv2_df", Some(sym::csky_target_feature)),
304-
("fpuv3_sf", Some(sym::csky_target_feature)),
336+
("fpuv2_sf", Some(sym::csky_target_feature)),
305337
("fpuv3_df", Some(sym::csky_target_feature)),
306-
("vdspv2", Some(sym::csky_target_feature)),
307-
("dspv2", Some(sym::csky_target_feature)),
338+
("fpuv3_hf", Some(sym::csky_target_feature)),
339+
("fpuv3_hi", Some(sym::csky_target_feature)),
340+
("fpuv3_sf", Some(sym::csky_target_feature)),
341+
("hard-float", Some(sym::csky_target_feature)),
342+
("hard-float-abi", Some(sym::csky_target_feature)),
343+
// tidy-alphabetical-end
308344
];
309345
/// When rustdoc is running, provide a list of all known features so that all their respective
310346
/// primitives may be documented.

‎compiler/rustc_target/src/asm/csky.rs

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ impl CSKYInlineAsmRegClass {
3636
_arch: InlineAsmArch,
3737
) -> &'static [(InlineAsmType, Option<Symbol>)] {
3838
match self {
39-
Self::reg => types! { _: I8, I16, I32, I64, F32, F64; },
40-
Self::freg => types! { _: F32, F64; },
39+
Self::reg => types! { _: I8, I16, I32; },
40+
Self::freg => types! { _: F32; },
4141
}
4242
}
4343
}
@@ -52,31 +52,21 @@ def_regs! {
5252
r4: reg = ["r4","l0"],
5353
r5: reg = ["r5","l1"],
5454
r6: reg = ["r6","l2"],
55-
// r7: reg = ["r7","l3"],
56-
// r8: reg = ["r8","l4"],
57-
// r9: reg = ["r9","l5"],
58-
// r10: reg = ["r10","l6"],
59-
// r11: reg = ["r11","l7"],
60-
// r12: reg = ["r12","t0"],
61-
// r13: reg = ["r13","t1"],
62-
// r14: reg = ["r14","sp"],
63-
// r15: reg = ["r15","lr"],
64-
// r16: reg = ["r16","l8"],
65-
// r17: reg = ["r17","l9"],
66-
// r18: reg = ["r18","t2"],
67-
// r19: reg = ["r19","t3"],
68-
// r20: reg = ["r20","t4"],
69-
// r21: reg = ["r21","t5"],
70-
// r22: reg = ["r22","t6"],
71-
// r23: reg = ["r23","t7", "fp"],
72-
// r24: reg = ["r24","t8", "sop"],
73-
// r25: reg = ["r25","tp", "bsp"],
74-
// r26: reg = ["r26"],
75-
// r27: reg = ["r27"],
76-
// r28: reg = ["r28","gb", "rgb", "rdb"],
77-
// r29: reg = ["r29","tb", "rtb"],
78-
// r30: reg = ["r30","svbr"],
79-
// r31: reg = ["r31","tls"],
55+
r9: reg = ["r9","l5"],// feature e2
56+
r10: reg = ["r10","l6"],// feature e2
57+
r11: reg = ["r11","l7"],// feature e2
58+
r12: reg = ["r12","t0"],// feature e2
59+
r13: reg = ["r13","t1"],// feature e2
60+
r16: reg = ["r16","l8"],// feature high-register
61+
r17: reg = ["r17","l9"],// feature high-register
62+
r18: reg = ["r18","t2"],// feature high-register
63+
r19: reg = ["r19","t3"],// feature high-register
64+
r20: reg = ["r20","t4"],// feature high-register
65+
r21: reg = ["r21","t5"],// feature high-register
66+
r22: reg = ["r22","t6"],// feature high-register
67+
r23: reg = ["r23","t7", "fp"],// feature high-register
68+
r24: reg = ["r24","t8", "sop"],// feature high-register
69+
r25: reg = ["r25","t9","tp", "bsp"],// feature high-register
8070
f0: freg = ["fr0","vr0"],
8171
f1: freg = ["fr1","vr1"],
8272
f2: freg = ["fr2","vr2"],
@@ -121,10 +111,6 @@ def_regs! {
121111
"reserver for tls",
122112
#error = ["r28", "gb", "rgb", "rdb"] =>
123113
"the global pointer cannot be used as an operand for inline asm",
124-
#error = ["r9","l5", "r10","l6", "r11","l7", "r12","t0", "r13","t1"] =>
125-
"reserved (no E2)",
126-
#error = ["r16","l8", "r17","l9", "r18","t2", "r19","t3", "r20","t4", "r21","t5", "r22","t6", "r23","t7", "fp", "r24","t8", "sop", "r25","tp", "bsp"] =>
127-
"reserved (no HighRegisters)",
128114
#error = ["r26","r27","r29","tb", "rtb", "r30","svbr"] =>
129115
"reserved by the ABI",
130116
}

‎compiler/rustc_target/src/spec/csky_unknown_linux_gnuabiv2.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
use crate::spec::{Target, TargetOptions};
1+
use crate::spec::{Cc, LinkerFlavor, Lld, Target, TargetOptions};
22

33
// This target is for glibc Linux on Csky
4-
// hardfloat.
54

65
pub fn target() -> Target {
76
Target {
@@ -12,10 +11,9 @@ pub fn target() -> Target {
1211
arch: "csky".into(),
1312
options: TargetOptions {
1413
abi: "abiv2".into(),
15-
//+hard-float, +hard-float-abi, +fpuv2_sf, +fpuv2_df, +fpuv3_sf, +fpuv3_df, +vdspv2, +dspv2, +vdspv1, +3e3r1
16-
features: "".into(),
14+
features: "+2e3,+3e7,+7e10,+cache,+dsp1e2,+dspe60,+e1,+e2,+edsp,+elrw,+hard-tp,+high-registers,+hwdiv,+mp,+mp1e2,+nvic,+trust".into(),
15+
late_link_args_static: TargetOptions::link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-l:libatomic.a"]),
1716
max_atomic_width: Some(32),
18-
// mcount: "\u{1}__gnu_mcount_nc".into(),
1917
..super::linux_gnu_base::opts()
2018
},
2119
}

‎src/bootstrap/llvm.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,22 @@ impl Step for Llvm {
390390
ldflags.shared.push(" -latomic");
391391
}
392392

393+
if target.starts_with("csky")
394+
&& !target.contains("freebsd")
395+
&& !target.contains("openbsd")
396+
&& !target.contains("netbsd")
397+
{
398+
// CSKY GCC erroneously requires linking against
399+
// `libatomic` when using 1-byte and 2-byte C++
400+
// atomics but the LLVM build system check cannot
401+
// detect this. Therefore it is set manually here.
402+
// Some BSD uses Clang as its system compiler and
403+
// provides no libatomic in its base system so does
404+
// not want this.
405+
ldflags.exe.push(" -latomic");
406+
ldflags.shared.push(" -latomic");
407+
}
408+
393409
if target.contains("msvc") {
394410
cfg.define("LLVM_USE_CRT_DEBUG", "MT");
395411
cfg.define("LLVM_USE_CRT_RELEASE", "MT");

‎src/doc/rustc/src/platform-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ target | std | host | notes
259259
`avr-unknown-gnu-atmega328` | * | | AVR. Requires `-Z build-std=core`
260260
`bpfeb-unknown-none` | * | | BPF (big endian)
261261
`bpfel-unknown-none` | * | | BPF (little endian)
262-
`csky-unknown-linux-gnuabiv2` | ? | | C-SKY iv2 Linux
262+
`csky-unknown-linux-gnuabiv2` | ✓ | | C-SKY abiv2 Linux(little endian)
263263
`hexagon-unknown-linux-musl` | ? | |
264264
`i386-apple-ios` | ✓ | | 32-bit x86 iOS
265265
[`i586-pc-nto-qnx700`](platform-support/nto-qnx.md) | * | | 32-bit x86 QNX Neutrino 7.0 RTOS |

‎src/doc/rustc/src/platform-support/csky-unknown-linux-gnuabiv2.md

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
This target supports [C-SKY](https://github.com/c-sky) CPUs with `abi` v2 and `glibc`.
66

77
https://c-sky.github.io/
8+
https://gitlab.com/c-sky/
9+
810
## Target maintainers
911

1012
* [@Dirreke](https://github.com/Dirreke)
@@ -14,20 +16,55 @@ https://c-sky.github.io/
1416

1517
## Building the target
1618

17-
add `csky-unknown-linux-gnuabiv2` to the `target` list in `config.toml` and `./x build`.
19+
### Get a C toolchain
20+
21+
Compiling rust for this target has been tested on `x86_64` linux hosts. Other host types have not been tested, but may work, if you can find a suitable cross compilation toolchain for them.
22+
23+
If you don't already have a suitable toolchain, you can download from [here](https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource/1356021/1619528643136/csky-linux-gnuabiv2-tools-x86_64-glibc-linux-4.9.56-20210423.tar.gz), and unpack it into a directory.
24+
25+
### Configure rust
26+
27+
The target can be built by enabling it for a `rustc` build, by placing the following in `config.toml`:
28+
29+
```toml
30+
[build]
31+
target = ["x86_64-unknown-linux-gnu", "csky-unknown-linux-gnuabiv2"]
32+
stage = 2
1833

19-
## Building Rust programs
34+
[target.csky-unknown-linux-gnuabiv2]
35+
# ADJUST THIS PATH TO POINT AT YOUR TOOLCHAIN
36+
cc = "${TOOLCHAIN_PATH}/bin/csky-linux-gnuabiv2-gcc"
2037

21-
Rust programs can be built for that target:
38+
### Build
2239

23-
```text
24-
cargo +stage2 --target csky-unknown-linux-gnuabiv2 your-code.rs
40+
```sh
41+
# in rust dir
42+
./x.py build --stage 2
2543
```
2644

27-
## Testing
45+
## Building and Running Rust programs
2846

29-
Currently there is no support to run the rustc test suite for this target.
47+
To test cross-compiled binaries on a `x86_64` system, you can use the `qemu-cskyv2`. This avoids having a full emulated ARM system by doing dynamic binary translation and dynamic system call translation. It lets you run CSKY programs directly on your `x86_64` kernel. It's very convenient!
3048

31-
## Cross-compilation toolchains and C code
49+
To use:
50+
51+
* Install `qemu-cskyv2` (If you don't already have a qemu, you can download from [here](https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1689324918932/xuantie-qemu-x86_64-Ubuntu-18.04-20230714-0202.tar.gz"), and unpack it into a directory.)
52+
* Link your built toolchain via:
53+
* `rustup toolchain link stage2 ${RUST}/build/x86_64-unknown-linux-gnu/stage2`
54+
* Create a test program
55+
56+
```sh
57+
cargo new hello_world
58+
cd hello_world
59+
```
60+
61+
* Build and run
62+
63+
```sh
64+
CARGO_TARGET_CSKY_UNKNOWN_LINUX_GNUABIV2_RUNNER=${QEMU_PATH}/bin/qemu-cskyv2 -L ${TOOLCHAIN_PATH}/csky-linux-gnuabiv2/libc \
65+
CARGO_TARGET_CSKY_UNKNOWN_LINUX_GNUABIV2_LINKER=${TOOLCHAIN_PATH}/bin/csky-linux-gnuabiv2-gcc \
66+
RUSTFLAGS="-C target-features=+crt-static" \
67+
cargo +stage2 run --target csky-unknown-linux-gnuabiv2
68+
```
3269

33-
This target can be cross-compiled from `x86_64` on either Linux systems with [`csky-linux-gunabiv2-tools-x86_64-glibc-linux`](https://github.com/c-sky/toolchain-build).
70+
Attention: The dynamic-linked program may nor be run by `qemu-cskyv2` but can be run on the target.

‎src/doc/unstable-book/src/language-features/asm-experimental-arch.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
8282
| MSP430 | `reg` | None | `i8`, `i16` |
8383
| M68k | `reg`, `reg_addr` | None | `i16`, `i32` |
8484
| M68k | `reg_data` | None | `i8`, `i16`, `i32` |
85-
| CSKY | `reg` | None | `i8`, `i16`, `i32`, `i64` |
86-
| CSKY | `freg` | None | `f32`, `f64` |
85+
| CSKY | `reg` | None | `i8`, `i16`, `i32` |
86+
| CSKY | `freg` | None | `f32`, |
8787
| s390x | `reg` | None | `i8`, `i16`, `i32`, `i64` |
8888
| s390x | `freg` | None | `f32`, `f64` |
8989

@@ -107,9 +107,16 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
107107
| M68k | `a5` | `bp` |
108108
| M68k | `a6` | `fp` |
109109
| M68k | `a7` | `sp`, `usp`, `ssp`, `isp` |
110+
| CSKY | `r[0-3]` | `a[0-3]` |
111+
| CSKY | `r[4-11]` | `l[0-7]` |
112+
| CSKY | `r[12-13]` | `t[0-1]` |
110113
| CSKY | `r14` | `sp` |
111114
| CSKY | `r15` | `lr` |
112-
| CSKY | `r28` | `gb`, `rgb`, `rdb` |
115+
| CSKY | `r[16-17]` | `l[8-9]` |
116+
| CSKY | `r[18-25]` | `t[2-9]` |
117+
| CSKY | `r28` | `rgb` |
118+
| CSKY | `r29` | `rtb` |
119+
| CSKY | `r30` | `svbr` |
113120
| CSKY | `r31` | `tls` |
114121

115122
> **Notes**:
@@ -132,6 +139,13 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
132139
| AVR | `r0`, `r1`, `r1r0` | Due to an issue in LLVM, the `r0` and `r1` registers cannot be used as inputs or outputs. If modified, they must be restored to their original values before the end of the block. |
133140
|MSP430 | `r0`, `r2`, `r3` | These are the program counter, status register, and constant generator respectively. Neither the status register nor constant generator can be written to. |
134141
| M68k | `a4`, `a5` | Used internally by LLVM for the base pointer and global base pointer. |
142+
| CSKY | `r7`, `r28` | Used internally by LLVM for the base pointer and global base pointer. |
143+
| CSKY | `r8` | Used internally by LLVM for the frame pointer. |
144+
| CSKY | `r14` | Used internally by LLVM for the stack pointer. |
145+
| CSKY | `r15` | This is the link register. |
146+
| CSKY | `r[26-30]` | Reserved by its ABI. |
147+
| CSKY | `r31` | This is the TLS register. |
148+
135149

136150
## Template modifiers
137151

@@ -148,6 +162,8 @@ This feature tracks `asm!` and `global_asm!` support for the following architect
148162
| PowerPC | `freg` | None | `0` | None |
149163
| s390x | `reg` | None | `%r0` | None |
150164
| s390x | `freg` | None | `%f0` | None |
165+
| CSKY | `reg` | None | `r0` | None |
166+
| CSKY | `freg` | None | `f0` | None |
151167

152168
# Flags covered by `preserves_flags`
153169

0 commit comments

Comments
 (0)