Skip to content

Commit d3275eb

Browse files
jservjserv
committed
Use upstream SoftFloat and unify build system
Replace custom Berkeley SoftFloat 3 package in 'src/softfloat' with the upstream one. It streamlines build system onfiguration for consistency.
1 parent 1286b3c commit d3275eb

File tree

8 files changed

+352
-12
lines changed

8 files changed

+352
-12
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
shallow = true
99
[submodule "softfloat"]
1010
path = src/softfloat
11-
url = https://github.com/sysprog21/berkeley-softfloat-3
12-
branch = rv32emu
11+
url = https://github.com/ucb-bar/berkeley-softfloat-3
1312
shallow = true
1413
[submodule "tests/ansibench"]
1514
path = tests/ansibench

‎Makefile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,10 @@ AR := ar
114114
ifeq ("$(CC_IS_EMCC)", "1")
115115
AR = emar
116116
endif
117-
SOFTFLOAT_OUT = $(abspath $(OUT)/softfloat)
118-
src/softfloat/build/Linux-RISCV-GCC/Makefile:
119-
git submodule update --init src/softfloat/
120-
SOFTFLOAT_LIB := $(SOFTFLOAT_OUT)/softfloat.a
121-
$(SOFTFLOAT_LIB): src/softfloat/build/Linux-RISCV-GCC/Makefile
122-
$(MAKE) -C $(dir $<) BUILD_DIR=$(SOFTFLOAT_OUT) CC=$(CC) AR=$(AR)
117+
118+
# Berkeley SoftFloat
119+
include mk/softfloat.mk
120+
123121
ifeq ($(call has, SYSTEM), 1)
124122
DEV_OUT := $(OUT)/devices
125123
endif
@@ -415,6 +413,7 @@ endif
415413

416414
clean:
417415
$(RM) $(BIN) $(OBJS) $(DEV_OBJS) $(BUILD_DTB) $(BUILD_DTB2C) $(HIST_BIN) $(HIST_OBJS) $(deps) $(WEB_FILES) $(CACHE_OUT) src/rv32_jit.c
416+
-$(RM) $(SOFTFLOAT_LIB)
418417
distclean: clean
419418
-$(RM) $(DOOM_DATA) $(QUAKE_DATA) $(BUILDROOT_DATA) $(LINUX_DATA)
420419
$(RM) -r $(OUT)/linux-image
@@ -424,6 +423,6 @@ distclean: clean
424423
$(RM) *.zip
425424
$(RM) -r $(OUT)/mini-gdbstub
426425
-$(RM) $(OUT)/.config
427-
-$(RM) -r $(OUT)/softfloat
426+
-$(RM) -r $(SOFTFLOAT_DUMMY_PLAT) $(OUT)/softfloat
428427

429428
-include $(deps)

‎mk/softfloat.mk‎

Lines changed: 339 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,339 @@
1+
SOFTFLOAT_SRC := src/softfloat/source
2+
3+
# FIXME: Suppress compilation warnings in upstream SoftFloat 3
4+
CFLAGS_softfloat := \
5+
-Wno-unused-parameter \
6+
-Wno-unused-variable \
7+
-Wno-sign-compare \
8+
-Wno-implicit-fallthrough \
9+
-I$(SOFTFLOAT_SRC)/RISCV \
10+
-I$(SOFTFLOAT_SRC)/include
11+
12+
# FIXME: make the flags configurable
13+
CFLAGS_softfloat += \
14+
-I$(OUT)/softfloat \
15+
-D LITTLEENDIAN=1 \
16+
-D INLINE_LEVEL=5 \
17+
-D SOFTFLOAT_ROUND_ODD \
18+
-D SOFTFLOAT_FAST_INT64 \
19+
-D SOFTFLOAT_FAST_DIV64TO32 \
20+
-D INLINE='static inline'
21+
22+
SOFTFLOAT_OBJS_PRIMITIVES = \
23+
s_eq128.o \
24+
s_le128.o \
25+
s_lt128.o \
26+
s_shortShiftLeft128.o \
27+
s_shortShiftRight128.o \
28+
s_shortShiftRightJam64.o \
29+
s_shortShiftRightJam64Extra.o \
30+
s_shortShiftRightJam128.o \
31+
s_shortShiftRightJam128Extra.o \
32+
s_shiftRightJam32.o \
33+
s_shiftRightJam64.o \
34+
s_shiftRightJam64Extra.o \
35+
s_shiftRightJam128.o \
36+
s_shiftRightJam128Extra.o \
37+
s_shiftRightJam256M.o \
38+
s_countLeadingZeros8.o \
39+
s_countLeadingZeros16.o \
40+
s_countLeadingZeros32.o \
41+
s_countLeadingZeros64.o \
42+
s_add128.o \
43+
s_add256M.o \
44+
s_sub128.o \
45+
s_sub256M.o \
46+
s_mul64ByShifted32To128.o \
47+
s_mul64To128.o \
48+
s_mul128By32.o \
49+
s_mul128To256M.o \
50+
s_approxRecip_1Ks.o \
51+
s_approxRecip32_1.o \
52+
s_approxRecipSqrt_1Ks.o \
53+
s_approxRecipSqrt32_1.o
54+
55+
SOFTFLOAT_OBJS_SPECIALIZE = \
56+
RISCV/softfloat_raiseFlags.o \
57+
RISCV/s_propagateNaNF16UI.o \
58+
RISCV/s_propagateNaNF32UI.o \
59+
RISCV/s_propagateNaNF64UI.o \
60+
RISCV/s_propagateNaNF128UI.o
61+
62+
SOFTFLOAT_OBJS_OTHERS = \
63+
s_roundToUI32.o \
64+
s_roundToUI64.o \
65+
s_roundToI32.o \
66+
s_roundToI64.o \
67+
s_normSubnormalF16Sig.o \
68+
s_roundPackToF16.o \
69+
s_normRoundPackToF16.o \
70+
s_addMagsF16.o \
71+
s_subMagsF16.o \
72+
s_mulAddF16.o \
73+
s_normSubnormalF32Sig.o \
74+
s_roundPackToF32.o \
75+
s_normRoundPackToF32.o \
76+
s_addMagsF32.o \
77+
s_subMagsF32.o \
78+
s_mulAddF32.o \
79+
s_normSubnormalF64Sig.o \
80+
s_roundPackToF64.o \
81+
s_normRoundPackToF64.o \
82+
s_addMagsF64.o \
83+
s_subMagsF64.o \
84+
s_mulAddF64.o \
85+
s_normSubnormalExtF80Sig.o \
86+
s_roundPackToExtF80.o \
87+
s_normRoundPackToExtF80.o \
88+
s_addMagsExtF80.o \
89+
s_subMagsExtF80.o \
90+
s_normSubnormalF128Sig.o \
91+
s_roundPackToF128.o \
92+
s_normRoundPackToF128.o \
93+
s_addMagsF128.o \
94+
s_subMagsF128.o \
95+
s_mulAddF128.o \
96+
softfloat_state.o \
97+
ui32_to_f16.o \
98+
ui32_to_f32.o \
99+
ui32_to_f64.o \
100+
ui32_to_extF80.o \
101+
ui32_to_extF80M.o \
102+
ui32_to_f128.o \
103+
ui32_to_f128M.o \
104+
ui64_to_f16.o \
105+
ui64_to_f32.o \
106+
ui64_to_f64.o \
107+
ui64_to_extF80.o \
108+
ui64_to_extF80M.o \
109+
ui64_to_f128.o \
110+
ui64_to_f128M.o \
111+
i32_to_f16.o \
112+
i32_to_f32.o \
113+
i32_to_f64.o \
114+
i32_to_extF80.o \
115+
i32_to_extF80M.o \
116+
i32_to_f128.o \
117+
i32_to_f128M.o \
118+
i64_to_f16.o \
119+
i64_to_f32.o \
120+
i64_to_f64.o \
121+
i64_to_extF80.o \
122+
i64_to_extF80M.o \
123+
i64_to_f128.o \
124+
i64_to_f128M.o \
125+
f16_to_ui32.o \
126+
f16_to_ui64.o \
127+
f16_to_i32.o \
128+
f16_to_i64.o \
129+
f16_to_ui32_r_minMag.o \
130+
f16_to_ui64_r_minMag.o \
131+
f16_to_i32_r_minMag.o \
132+
f16_to_i64_r_minMag.o \
133+
f16_to_f32.o \
134+
f16_to_f64.o \
135+
f16_to_extF80.o \
136+
f16_to_extF80M.o \
137+
f16_to_f128.o \
138+
f16_to_f128M.o \
139+
f16_roundToInt.o \
140+
f16_add.o \
141+
f16_sub.o \
142+
f16_mul.o \
143+
f16_mulAdd.o \
144+
f16_div.o \
145+
f16_rem.o \
146+
f16_sqrt.o \
147+
f16_eq.o \
148+
f16_le.o \
149+
f16_lt.o \
150+
f16_eq_signaling.o \
151+
f16_le_quiet.o \
152+
f16_lt_quiet.o \
153+
f16_isSignalingNaN.o \
154+
f32_to_ui32.o \
155+
f32_to_ui64.o \
156+
f32_to_i32.o \
157+
f32_to_i64.o \
158+
f32_to_ui32_r_minMag.o \
159+
f32_to_ui64_r_minMag.o \
160+
f32_to_i32_r_minMag.o \
161+
f32_to_i64_r_minMag.o \
162+
f32_to_f16.o \
163+
f32_to_f64.o \
164+
f32_to_extF80.o \
165+
f32_to_extF80M.o \
166+
f32_to_f128.o \
167+
f32_to_f128M.o \
168+
f32_roundToInt.o \
169+
f32_add.o \
170+
f32_sub.o \
171+
f32_mul.o \
172+
f32_mulAdd.o \
173+
f32_div.o \
174+
f32_rem.o \
175+
f32_sqrt.o \
176+
f32_eq.o \
177+
f32_le.o \
178+
f32_lt.o \
179+
f32_eq_signaling.o \
180+
f32_le_quiet.o \
181+
f32_lt_quiet.o \
182+
f32_isSignalingNaN.o \
183+
f64_to_ui32.o \
184+
f64_to_ui64.o \
185+
f64_to_i32.o \
186+
f64_to_i64.o \
187+
f64_to_ui32_r_minMag.o \
188+
f64_to_ui64_r_minMag.o \
189+
f64_to_i32_r_minMag.o \
190+
f64_to_i64_r_minMag.o \
191+
f64_to_f16.o \
192+
f64_to_f32.o \
193+
f64_to_extF80.o \
194+
f64_to_extF80M.o \
195+
f64_to_f128.o \
196+
f64_to_f128M.o \
197+
f64_roundToInt.o \
198+
f64_add.o \
199+
f64_sub.o \
200+
f64_mul.o \
201+
f64_mulAdd.o \
202+
f64_div.o \
203+
f64_rem.o \
204+
f64_sqrt.o \
205+
f64_eq.o \
206+
f64_le.o \
207+
f64_lt.o \
208+
f64_eq_signaling.o \
209+
f64_le_quiet.o \
210+
f64_lt_quiet.o \
211+
f64_isSignalingNaN.o \
212+
extF80_to_ui32.o \
213+
extF80_to_ui64.o \
214+
extF80_to_i32.o \
215+
extF80_to_i64.o \
216+
extF80_to_ui32_r_minMag.o \
217+
extF80_to_ui64_r_minMag.o \
218+
extF80_to_i32_r_minMag.o \
219+
extF80_to_i64_r_minMag.o \
220+
extF80_to_f16.o \
221+
extF80_to_f32.o \
222+
extF80_to_f64.o \
223+
extF80_to_f128.o \
224+
extF80_roundToInt.o \
225+
extF80_add.o \
226+
extF80_sub.o \
227+
extF80_mul.o \
228+
extF80_div.o \
229+
extF80_rem.o \
230+
extF80_sqrt.o \
231+
extF80_eq.o \
232+
extF80_le.o \
233+
extF80_lt.o \
234+
extF80_eq_signaling.o \
235+
extF80_le_quiet.o \
236+
extF80_lt_quiet.o \
237+
extF80_isSignalingNaN.o \
238+
extF80M_to_ui32.o \
239+
extF80M_to_ui64.o \
240+
extF80M_to_i32.o \
241+
extF80M_to_i64.o \
242+
extF80M_to_ui32_r_minMag.o \
243+
extF80M_to_ui64_r_minMag.o \
244+
extF80M_to_i32_r_minMag.o \
245+
extF80M_to_i64_r_minMag.o \
246+
extF80M_to_f16.o \
247+
extF80M_to_f32.o \
248+
extF80M_to_f64.o \
249+
extF80M_to_f128M.o \
250+
extF80M_roundToInt.o \
251+
extF80M_add.o \
252+
extF80M_sub.o \
253+
extF80M_mul.o \
254+
extF80M_div.o \
255+
extF80M_rem.o \
256+
extF80M_sqrt.o \
257+
extF80M_eq.o \
258+
extF80M_le.o \
259+
extF80M_lt.o \
260+
extF80M_eq_signaling.o \
261+
extF80M_le_quiet.o \
262+
extF80M_lt_quiet.o \
263+
f128_to_ui32.o \
264+
f128_to_ui64.o \
265+
f128_to_i32.o \
266+
f128_to_i64.o \
267+
f128_to_ui32_r_minMag.o \
268+
f128_to_ui64_r_minMag.o \
269+
f128_to_i32_r_minMag.o \
270+
f128_to_i64_r_minMag.o \
271+
f128_to_f16.o \
272+
f128_to_f32.o \
273+
f128_to_extF80.o \
274+
f128_to_f64.o \
275+
f128_roundToInt.o \
276+
f128_add.o \
277+
f128_sub.o \
278+
f128_mul.o \
279+
f128_mulAdd.o \
280+
f128_div.o \
281+
f128_rem.o \
282+
f128_sqrt.o \
283+
f128_eq.o \
284+
f128_le.o \
285+
f128_lt.o \
286+
f128_eq_signaling.o \
287+
f128_le_quiet.o \
288+
f128_lt_quiet.o \
289+
f128_isSignalingNaN.o \
290+
f128M_to_ui32.o \
291+
f128M_to_ui64.o \
292+
f128M_to_i32.o \
293+
f128M_to_i64.o \
294+
f128M_to_ui32_r_minMag.o \
295+
f128M_to_ui64_r_minMag.o \
296+
f128M_to_i32_r_minMag.o \
297+
f128M_to_i64_r_minMag.o \
298+
f128M_to_f16.o \
299+
f128M_to_f32.o \
300+
f128M_to_extF80M.o \
301+
f128M_to_f64.o \
302+
f128M_roundToInt.o \
303+
f128M_add.o \
304+
f128M_sub.o \
305+
f128M_mul.o \
306+
f128M_mulAdd.o \
307+
f128M_div.o \
308+
f128M_rem.o \
309+
f128M_sqrt.o \
310+
f128M_eq.o \
311+
f128M_le.o \
312+
f128M_lt.o \
313+
f128M_eq_signaling.o \
314+
f128M_le_quiet.o \
315+
f128M_lt_quiet.o
316+
317+
SOFTFLOAT_OBJS := \
318+
$(addprefix $(OUT)/softfloat/, \
319+
$(SOFTFLOAT_OBJS_PRIMITIVES) \
320+
$(SOFTFLOAT_OBJS_SPECIALIZE) \
321+
$(SOFTFLOAT_OBJS_OTHERS) \
322+
)
323+
324+
SOFTFLOAT_DUMMY_PLAT := $(OUT)/softfloat/platform.h
325+
$(SOFTFLOAT_DUMMY_PLAT):
326+
$(Q)mkdir -p $(shell dirname $@)
327+
$(Q)touch $@
328+
329+
$(OUT)/softfloat/%.o: $(SOFTFLOAT_SRC)/%.c
330+
$(Q)mkdir -p $(shell dirname $@)
331+
$(VECHO) " CC\t$@\n"
332+
$(Q)$(CC) -o $@ $(CFLAGS) $(CFLAGS_softfloat) -c -MMD -MF $@.d $<
333+
334+
$(SOFTFLOAT_SRC):
335+
$(Q)git submodule update --init $(dir $@)
336+
SOFTFLOAT_LIB := $(OUT)/softfloat/softfloat.a
337+
$(SOFTFLOAT_LIB): $(SOFTFLOAT_SRC) $(SOFTFLOAT_DUMMY_PLAT) $(SOFTFLOAT_OBJS)
338+
$(VECHO) " AR\t$@\n"
339+
$(Q)$(AR) crs $@ $(SOFTFLOAT_OBJS)

‎mk/toolchain.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ ifeq ($(UNAME_S),Darwin)
7272
endif
7373
endif
7474

75+
# Utilities
76+
AR ?= ar
77+
7578
# Supported GNU Toolchain for RISC-V
7679
TOOLCHAIN_LIST := riscv-none-elf- \
7780
riscv32-unknown-elf- \

0 commit comments

Comments
 (0)