Skip to content

Commit f05761d

Browse files
nikomatsakisbrson
nikomatsakis
authored and
brson
committed
enable intrinsics for multiple arch
1 parent f0c1f99 commit f05761d

File tree

6 files changed

+165
-21
lines changed

6 files changed

+165
-21
lines changed

‎mk/intrinsics.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $(INTRINSICS_LL): $(INTRINSICS_LL_IN) $(MKFILES)
1111
@$(call E, mkdir: intrinsics)
1212
$(Q)mkdir -p intrinsics
1313
@$(call E, sed: $@)
14-
$(Q)sed s/@CFG_LLVM_TRIPLE@/$(CFG_LLVM_TRIPLE)/g $< > $@
14+
$(Q)sed s/@CFG_TARGET_TRIPLE@/$(CFG_LLVM_TRIPLE)/g $< > $@
1515

1616
$(INTRINSICS_BC): $(INTRINSICS_LL) $(MKFILES)
1717
@$(call E, llvm-as: $@)

‎mk/rt.mk

+2
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash \
103103
RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o) $(RUNTIME_LL:.ll=.o) $(RUNTIME_S:.S=.o)
104104
RUNTIME_LIBS := $(LIBUV_LIB)
105105

106+
RT_COMPILE_C := $(call CFG_COMPILE_C, $(0), $(1) -I $(S)src/rt/arch/$(2))
107+
106108
rt/%.o: rt/%.cpp $(MKFILES)
107109
@$(call E, compile: $@)
108110
$(Q)$(call CFG_COMPILE_C, $@, $(RUNTIME_INCS)) $<

‎mk/target.mk

+13-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77

88
define TARGET_STAGE_N
99

10-
$$(TARGET_LIB$(1)$(2))/intrinsics.bc: $$(INTRINSICS_BC)
11-
@$$(call E, cp: $$@)
12-
$$(Q)cp $$< $$@
10+
TARGET_HOST := $$(word 1,$$(subst -, ,$(2)))
11+
12+
# For some reason there is (sometimes) a mismatch here between i686, i386, etc
13+
INTR_HOST := $$(subst i686,i386,$$(TARGET_HOST))
14+
15+
$$(TARGET_LIB$(1)$(2))/intrinsics.ll: \
16+
$$(S)src/rt/intrinsics/intrinsics.$$(INTR_HOST).ll.in
17+
@$$(call E, sed: $$@)
18+
sed s/@CFG_TARGET_TRIPLE@/$(2)/ $$< > $$@
19+
20+
$$(TARGET_LIB$(1)$(2))/intrinsics.bc: $$(TARGET_LIB$(1)$(2))/intrinsics.ll
21+
@$$(call E, llvms-as: $$@)
22+
$$(LLVM_AS) -o $$@ $$<
1323

1424
$$(TARGET_LIB$(1)$(2))/$$(CFG_STDLIB): \
1525
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \

‎src/etc/gen-intrinsics

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/sh
2+
3+
# This script generates new definitions for the intrinsics using
4+
# clang. This is not currently in the Makefile to avoid any dependency
5+
# on clang.
6+
7+
for ARCH in i386 x86_64
8+
do
9+
clang++ -emit-llvm -S -arch $ARCH -O3 -Isrc/rt/isaac -Isrc/rt/uthash \
10+
-Isrc/rt/arch/$ARCH -fno-stack-protector \
11+
-o src/rt/intrinsics/intrinsics.$ARCH.ll.in \
12+
src/rt/intrinsics/intrinsics.cpp
13+
sed -i "" \
14+
-e 's/^target datalayout =/; target datalayout =/' \
15+
src/rt/intrinsics/intrinsics.$ARCH.ll.in
16+
sed -i "" \
17+
-e 's/^target triple = "[^"]*"/target triple = "@CFG_TARGET_TRIPLE@"/' \
18+
src/rt/intrinsics/intrinsics.$ARCH.ll.in
19+
done

‎src/rt/intrinsics/intrinsics.ll.in renamed to ‎src/rt/intrinsics/intrinsics.i386.ll.in

+13-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
; ModuleID = 'intrinsics.cpp'
2-
target triple = "@CFG_LLVM_TRIPLE@"
1+
; ModuleID = 'src/rt/intrinsics/intrinsics.cpp'
2+
; target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"
3+
target triple = "@CFG_TARGET_TRIPLE@"
34

45
%0 = type { i32, %"struct.memory_region::alloc_header"**, i32 }
56
%1 = type { i32, %struct.rust_scheduler**, i32 }
@@ -52,10 +53,10 @@ target triple = "@CFG_LLVM_TRIPLE@"
5253
%struct.rust_vec = type { i32, i32, [0 x i8] }
5354
%"struct.std::_Rb_tree<void *, std::pair<void *const, const type_desc *>, std::_Select1st<std::pair<void *const, const type_desc *> >, std::less<void *>, std::allocator<std::pair<void *const, const type_desc *> > >::_Rb_tree_impl" = type { %struct.rust_cond, %"struct.std::_Rb_tree_node_base", i32 }
5455
%"struct.std::_Rb_tree_node_base" = type { i32, %"struct.std::_Rb_tree_node_base"*, %"struct.std::_Rb_tree_node_base"*, %"struct.std::_Rb_tree_node_base"* }
55-
%struct.type_desc = type { %struct.type_desc**, i32, i32, void (i8*, i8*, %struct.type_desc**, i8*)*, void (i8*, i8*, %struct.type_desc**, i8*)*, void (i8*, i8*, %struct.type_desc**, i8*)*, i8*, void (i8*, i8*, %struct.type_desc**, i8*)*, void (i8*, i8*, %struct.type_desc**, i8*)*, i32, void (i8*, i8*, %struct.type_desc**, i8*, i8*, i8)*, i8*, %struct.rust_shape_tables*, i32, i32, %struct.UT_hash_handle, i32, [0 x %struct.type_desc*] }
56+
%struct.type_desc = type { %struct.type_desc**, i32, i32, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, i8*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, i32, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*, i8*, i8)*, i8*, %struct.rust_shape_tables*, i32, i32, %struct.UT_hash_handle, i32, [0 x %struct.type_desc*] }
5657

5758
@.str = private unnamed_addr constant [42 x i8] c"attempt to cast values of differing sizes\00"
58-
@.str1 = private unnamed_addr constant [15 x i8] c"intrinsics.cpp\00"
59+
@.str1 = private unnamed_addr constant [33 x i8] c"src/rt/intrinsics/intrinsics.cpp\00"
5960

6061
define void @rust_intrinsic_vec_len(%struct.rust_task* nocapture %task, i32* nocapture %retptr, %struct.type_desc* nocapture %ty, %struct.rust_vec** nocapture %vp) nounwind {
6162
%1 = load %struct.rust_vec** %vp, align 4
@@ -77,7 +78,7 @@ define void @rust_intrinsic_ptr_offset(%struct.rust_task* nocapture %task, i8**
7778
ret void
7879
}
7980

80-
define void @rust_intrinsic_cast(%struct.rust_task* nocapture %task, i8* nocapture %retptr, %struct.type_desc* nocapture %t1, %struct.type_desc* nocapture %t2, i8* nocapture %src) {
81+
define void @rust_intrinsic_cast(%struct.rust_task* %task, i8* nocapture %retptr, %struct.type_desc* nocapture %t1, %struct.type_desc* nocapture %t2, i8* nocapture %src) {
8182
%1 = getelementptr inbounds %struct.type_desc* %t1, i32 0, i32 1
8283
%2 = load i32* %1, align 4
8384
%3 = getelementptr inbounds %struct.type_desc* %t2, i32 0, i32 1
@@ -86,7 +87,7 @@ define void @rust_intrinsic_cast(%struct.rust_task* nocapture %task, i8* nocaptu
8687
br i1 %5, label %7, label %6
8788

8889
; <label>:6 ; preds = %0
89-
tail call void @upcall_fail(i8* getelementptr inbounds ([42 x i8]* @.str, i32 0, i32 0), i8* getelementptr inbounds ([15 x i8]* @.str1, i32 0, i32 0), i32 32)
90+
tail call void @upcall_fail(%struct.rust_task* %task, i8* getelementptr inbounds ([42 x i8]* @.str, i32 0, i32 0), i8* getelementptr inbounds ([33 x i8]* @.str1, i32 0, i32 0), i32 32)
9091
br label %8
9192

9293
; <label>:7 ; preds = %0
@@ -97,7 +98,7 @@ define void @rust_intrinsic_cast(%struct.rust_task* nocapture %task, i8* nocaptu
9798
ret void
9899
}
99100

100-
declare void @upcall_fail(i8*, i8*, i32)
101+
declare void @upcall_fail(%struct.rust_task*, i8*, i8*, i32)
101102

102103
declare void @llvm.memmove.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32, i1) nounwind
103104

@@ -106,16 +107,11 @@ define void @rust_intrinsic_addr_of(%struct.rust_task* nocapture %task, i8** noc
106107
ret void
107108
}
108109

109-
define void @rust_intrinsic_recv(%struct.rust_task* nocapture %task, i8** %retptr, %struct.type_desc* nocapture %ty, %class.rust_port* %port) {
110-
%1 = bitcast i8** %retptr to i32*
111-
tail call void @port_recv(i32* %1, %class.rust_port* %port)
110+
define void @rust_intrinsic_recv(%struct.rust_task* %task, i8** %retptr, %struct.type_desc* nocapture %ty, %class.rust_port* %port) {
111+
%1 = bitcast %struct.rust_task* %task to i8*
112+
%2 = bitcast i8** %retptr to i32*
113+
tail call void @port_recv(i8* %1, i32* %2, %class.rust_port* %port)
112114
ret void
113115
}
114116

115-
declare void @port_recv(i32*, %class.rust_port*)
116-
117-
define void @rust_intrinsic_get_type_desc(%struct.rust_task* nocapture %task, i8** nocapture %retptr, %struct.type_desc* %ty) nounwind {
118-
%ty.c = bitcast %struct.type_desc* %ty to i8*
119-
store i8* %ty.c, i8** %retptr, align 4
120-
ret void
121-
}
117+
declare void @port_recv(i8*, i32*, %class.rust_port*)

‎src/rt/intrinsics/intrinsics.x86_64.ll.in

+117
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
; ModuleID = 'src/rt/intrinsics/intrinsics.cpp'
2+
; target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
3+
target triple = "@CFG_TARGET_TRIPLE@"
4+
5+
%0 = type { i64, %"struct.memory_region::alloc_header"**, i64 }
6+
%1 = type { i64, %struct.rust_scheduler**, i64 }
7+
%2 = type { %"struct.hash_map<long, rust_task *>::map_entry"* }
8+
%3 = type { %struct.rust_task*, i64, i64, %class.rust_chan** }
9+
%class.array_list = type { i64, %struct.rust_task**, i64 }
10+
%class.circular_buffer = type { %class.rust_kernel*, i64, i64, i64, i64, i8* }
11+
%class.context = type { %struct.registers_t, %class.context* }
12+
%"class.debug::task_debug_info" = type { %"class.std::map" }
13+
%class.hash_map = type { %"struct.hash_map<long, rust_port *>::map_entry"* }
14+
%class.indexed_list = type { i32 (...)**, %class.array_list }
15+
%class.lock_and_signal = type { i32 (...)**, %struct._opaque_pthread_cond_t, %struct._opaque_pthread_attr_t, %struct._opaque_pthread_t*, i8, i8 }
16+
%class.memory_region = type { i32 (...)**, %class.rust_srv*, %class.memory_region*, i32, %0, i8, i8, %class.lock_and_signal }
17+
%class.ptr_vec = type { %struct.rust_task*, i64, i64, %struct.rust_token** }
18+
%class.rust_chan = type { i64, %class.rust_kernel*, %struct.rust_task*, %class.rust_port*, i64, %class.circular_buffer }
19+
%class.rust_crate_cache = type { %struct.type_desc*, %struct.rust_scheduler*, i64 }
20+
%class.rust_kernel = type { i32 (...)**, %class.memory_region, %class.rust_log, %class.rust_srv*, %class.lock_and_signal, %1, %struct.randctx, i64, %2, i64, i32, i32, %struct.rust_env* }
21+
%class.rust_log = type { i32 (...)**, %class.rust_srv*, %struct.rust_scheduler*, i8 }
22+
%class.rust_obstack = type { %struct.rust_obstack_chunk*, %struct.rust_task* }
23+
%class.rust_port = type { i64, i64, %class.rust_kernel*, %struct.rust_task*, %class.rust_chan*, i64, %class.ptr_vec, %3, %class.lock_and_signal }
24+
%class.rust_srv = type { i32 (...)**, %struct.rust_env*, %class.memory_region }
25+
%"class.rust_task::wakeup_callback" = type { i32 (...)** }
26+
%class.rust_task_list = type { %class.indexed_list, %struct.rust_scheduler*, i8* }
27+
%class.rust_thread = type { i32 (...)**, i8, %struct._opaque_pthread_t* }
28+
%"class.std::_Rb_tree" = type { %"struct.std::_Rb_tree<void *, std::pair<void *const, const type_desc *>, std::_Select1st<std::pair<void *const, const type_desc *> >, std::less<void *>, std::allocator<std::pair<void *const, const type_desc *> > >::_Rb_tree_impl" }
29+
%"class.std::map" = type { %"class.std::_Rb_tree" }
30+
%class.timer = type { i32 (...)**, i64, i64 }
31+
%struct.UT_hash_bucket = type { %struct.UT_hash_handle*, i32, i32 }
32+
%struct.UT_hash_handle = type { %struct.UT_hash_table*, i8*, i8*, %struct.UT_hash_handle*, %struct.UT_hash_handle*, i8*, i32, i32 }
33+
%struct.UT_hash_table = type { %struct.UT_hash_bucket*, i32, i32, i32, %struct.UT_hash_handle*, i64, i32, i32, i32, i32 }
34+
%struct.__darwin_pthread_handler_rec = type { void (i8*)*, i8*, %struct.__darwin_pthread_handler_rec* }
35+
%struct._opaque_pthread_attr_t = type { i64, [56 x i8] }
36+
%struct._opaque_pthread_cond_t = type { i64, [40 x i8] }
37+
%struct._opaque_pthread_t = type { i64, %struct.__darwin_pthread_handler_rec*, [1168 x i8] }
38+
%struct.chan_handle = type { i64, i64 }
39+
%"struct.hash_map<long, rust_port *>::map_entry" = type opaque
40+
%"struct.hash_map<long, rust_task *>::map_entry" = type opaque
41+
%"struct.memory_region::alloc_header" = type { i32, i32, i8*, i32, [0 x i8] }
42+
%struct.randctx = type { i64, [256 x i64], [256 x i64], i64, i64, i64 }
43+
%struct.registers_t = type { [7 x i64], [6 x i64], i64 }
44+
%struct.rust_cond = type { i8 }
45+
%struct.rust_env = type { i64, i64, i8*, i8, i8, i8* }
46+
%struct.rust_obstack_chunk = type { %struct.rust_obstack_chunk*, i64, i64, i64, [0 x i8] }
47+
%struct.rust_scheduler = type { %class.rust_thread, i64, i64, %class.rust_log, i32, %class.rust_srv*, i8*, %class.rust_task_list, %class.rust_task_list, %class.rust_task_list, %class.rust_task_list, %class.rust_crate_cache, %struct.randctx, %class.rust_kernel*, i32, i32, %class.lock_and_signal, i64, %struct._opaque_pthread_attr_t, %struct.rust_env*, %class.context }
48+
%struct.rust_shape_tables = type { i8*, i8* }
49+
%struct.rust_task = type { %struct.rust_task_user, i64, %class.context, %struct.stk_seg*, i64, %struct.rust_scheduler*, %class.rust_crate_cache*, %class.rust_kernel*, i8*, %class.rust_task_list*, %struct.rust_cond*, i8*, %struct.rust_task*, i32, i64, %class.timer, i64*, %class.array_list, i32, i32, %class.memory_region, %"class.rust_task::wakeup_callback"*, i8, i8, i8, %class.lock_and_signal, %class.hash_map, %class.rust_obstack, %"class.std::map", i32, %"class.debug::task_debug_info" }
50+
%struct.rust_task_user = type { i64, i32, %struct.chan_handle, i64 }
51+
%struct.rust_token = type opaque
52+
%struct.rust_vec = type { i64, i64, [0 x i8] }
53+
%"struct.std::_Rb_tree<void *, std::pair<void *const, const type_desc *>, std::_Select1st<std::pair<void *const, const type_desc *> >, std::less<void *>, std::allocator<std::pair<void *const, const type_desc *> > >::_Rb_tree_impl" = type { %struct.rust_cond, %"struct.std::_Rb_tree_node_base", i64 }
54+
%"struct.std::_Rb_tree_node_base" = type { i32, %"struct.std::_Rb_tree_node_base"*, %"struct.std::_Rb_tree_node_base"*, %"struct.std::_Rb_tree_node_base"* }
55+
%struct.stk_seg = type { i32, i64, [0 x i8] }
56+
%struct.type_desc = type { %struct.type_desc**, i64, i64, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, i8*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*)*, i64, void (i8*, %struct.rust_task*, i8*, %struct.type_desc**, i8*, i8*, i8)*, i8*, %struct.rust_shape_tables*, i64, i64, %struct.UT_hash_handle, i64, [0 x %struct.type_desc*] }
57+
58+
@.str = private unnamed_addr constant [42 x i8] c"attempt to cast values of differing sizes\00"
59+
@.str1 = private unnamed_addr constant [33 x i8] c"src/rt/intrinsics/intrinsics.cpp\00"
60+
61+
define void @rust_intrinsic_vec_len(%struct.rust_task* nocapture %task, i64* nocapture %retptr, %struct.type_desc* nocapture %ty, %struct.rust_vec** nocapture %vp) nounwind {
62+
%1 = load %struct.rust_vec** %vp, align 8
63+
%2 = getelementptr inbounds %struct.rust_vec* %1, i64 0, i32 0
64+
%3 = load i64* %2, align 8
65+
%4 = getelementptr inbounds %struct.type_desc* %ty, i64 0, i32 1
66+
%5 = load i64* %4, align 8
67+
%6 = udiv i64 %3, %5
68+
store i64 %6, i64* %retptr, align 8
69+
ret void
70+
}
71+
72+
define void @rust_intrinsic_ptr_offset(%struct.rust_task* nocapture %task, i8** nocapture %retptr, %struct.type_desc* nocapture %ty, i8* %ptr, i64 %count) nounwind {
73+
%1 = getelementptr inbounds %struct.type_desc* %ty, i64 0, i32 1
74+
%2 = load i64* %1, align 8
75+
%3 = mul i64 %2, %count
76+
%4 = getelementptr inbounds i8* %ptr, i64 %3
77+
store i8* %4, i8** %retptr, align 8
78+
ret void
79+
}
80+
81+
define void @rust_intrinsic_cast(%struct.rust_task* %task, i8* nocapture %retptr, %struct.type_desc* nocapture %t1, %struct.type_desc* nocapture %t2, i8* nocapture %src) {
82+
%1 = getelementptr inbounds %struct.type_desc* %t1, i64 0, i32 1
83+
%2 = load i64* %1, align 8
84+
%3 = getelementptr inbounds %struct.type_desc* %t2, i64 0, i32 1
85+
%4 = load i64* %3, align 8
86+
%5 = icmp eq i64 %2, %4
87+
br i1 %5, label %7, label %6
88+
89+
; <label>:6 ; preds = %0
90+
tail call void @upcall_fail(%struct.rust_task* %task, i8* getelementptr inbounds ([42 x i8]* @.str, i64 0, i64 0), i8* getelementptr inbounds ([33 x i8]* @.str1, i64 0, i64 0), i64 32)
91+
br label %8
92+
93+
; <label>:7 ; preds = %0
94+
tail call void @llvm.memmove.p0i8.p0i8.i64(i8* %retptr, i8* %src, i64 %2, i32 1, i1 false)
95+
br label %8
96+
97+
; <label>:8 ; preds = %7, %6
98+
ret void
99+
}
100+
101+
declare void @upcall_fail(%struct.rust_task*, i8*, i8*, i64)
102+
103+
declare void @llvm.memmove.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i32, i1) nounwind
104+
105+
define void @rust_intrinsic_addr_of(%struct.rust_task* nocapture %task, i8** nocapture %retptr, %struct.type_desc* nocapture %ty, i8* %valptr) nounwind {
106+
store i8* %valptr, i8** %retptr, align 8
107+
ret void
108+
}
109+
110+
define void @rust_intrinsic_recv(%struct.rust_task* %task, i8** %retptr, %struct.type_desc* nocapture %ty, %class.rust_port* %port) {
111+
%1 = bitcast %struct.rust_task* %task to i8*
112+
%2 = bitcast i8** %retptr to i64*
113+
tail call void @port_recv(i8* %1, i64* %2, %class.rust_port* %port)
114+
ret void
115+
}
116+
117+
declare void @port_recv(i8*, i64*, %class.rust_port*)

0 commit comments

Comments
 (0)