Skip to content

Commit 1eb98f7

Browse files
kseniadobrovolskayakseniadobrovolskaya
committed
Added extensions to describe any agnostic behavior for vadd_vv
1 parent 61de306 commit 1eb98f7

File tree

7 files changed

+56
-1247
lines changed

7 files changed

+56
-1247
lines changed

‎ci-tests/test-spike‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -50,42 +50,41 @@ $INSTALL/bin/spike --log-commits --isa=rv64gc $BUILD/pk/pk atomics 2> /dev/null
5050
$INSTALL/bin/spike -l --log-commits --isa=rv64gcv_xspiketama_xspikema1s_xspiketa1s test-spiketama1s-ext &> spike-all-fill1s.log
5151
grep "v2 0x00000000ffffffffffffffff00000002" spike-all-fill1s.log
5252
grep "v3 0xffffffff000000000000000000000003" spike-all-fill1s.log
53-
grep "v4 0xffffffffffffffffffffffffff000000" spike-all-fill1s.log
54-
grep "v5 0xffffffffffffffffffffffffffffc000" spike-all-fill1s.log
55-
! grep "v6 0x" spike-all-fill1s.log
56-
grep "v7 0xffffffffffffffff00000000ffff0000" spike-all-fill1s.log
57-
grep "v8 0xffffffffffffffffffffffffffff0000" spike-all-fill1s.log
58-
grep "v9 0xffffffffffffffffffffffffff410113" spike-all-fill1s.log
59-
grep "v10 0xffffffffffff000002b1048700000113" spike-all-fill1s.log
53+
grep "v4 0xffffffffffffffff0000000000000000" spike-all-fill1s.log
54+
grep "v5 0x0000000000000000ffffffffffffffff" spike-all-fill1s.log
55+
grep "v6 0x00000000000000000000000000000000" spike-all-fill1s.log
56+
grep "v8 0x00000000000000000000000000000000" spike-all-fill1s.log
57+
grep "v9 0x00000000000000000000000000000000" spike-all-fill1s.log
58+
grep "v10 0xffffffffffffffff0000000000000000" spike-all-fill1s.log
6059
grep "v11 0xffffffffffffffffffffffffffffffff" spike-all-fill1s.log
61-
grep "v12 0xffffffff02b10487000000000c410113" spike-all-fill1s.log
62-
grep "v13 0xffffffffffffffffffffffffffffffff" spike-all-fill1s.log
63-
grep "v14 0x0c4101130c410113000000000c410113" spike-all-fill1s.log
64-
grep "v15 0xffffffffffffffff000000000c410113" spike-all-fill1s.log
65-
grep "v16 0xffffffffffffffffffff000000000000" spike-all-fill1s.log
66-
grep "v17 0xffffffffffffffffffffffffffffffff" spike-all-fill1s.log
67-
grep "v18 0xffffffffffffffffffffffffffffffff" spike-all-fill1s.log
68-
grep "v19 0xffffffffffffffffffffffffffffffff" spike-all-fill1s.log
69-
grep "v20 0xffffffff000000000206205700000113" spike-all-fill1s.log
70-
grep "v21 0xffffffff0000000055076e0000000c41" spike-all-fill1s.log
71-
grep "v22 0xffffffff000000000001b05700000487" spike-all-fill1s.log
72-
grep "v24 0xffffffffffffffffffffffffff000000" spike-all-fill1s.log
73-
grep "v25 0xffffffffffffffffffffffffff000000" spike-all-fill1s.log
74-
grep "v26 0xffff000000000000f557b05700000113" spike-all-fill1s.log
75-
grep "v27 0xffff000000000000cc81020600000c41" spike-all-fill1s.log
76-
grep "v28 0xffff0000000000000213550700000487" spike-all-fill1s.log
77-
grep "v29 0xffff00000000000000200001000002b1" spike-all-fill1s.log
78-
grep "v30 0xffffffffffffffff000000000c410113" spike-all-fill1s.log
79-
grep "v31 0xffffffffffffffff0000000002b10487" spike-all-fill1s.log
8060
$INSTALL/bin/spike -l --log-commits --isa=rv64gcv_xspiketama_xspikema1s test-spiketama1s-ext &> spike-mask-fill1s.log
8161
grep "v2 0x00000000ffffffffffffffff00000002" spike-mask-fill1s.log
8262
grep "v3 0x00000000000000000000000000000003" spike-mask-fill1s.log
63+
grep "v4 0xffffffffffffffff0000000000000000" spike-mask-fill1s.log
64+
grep "v5 0x0000000000000000ffffffffffffffff" spike-mask-fill1s.log
65+
grep "v6 0x00000000000000000000000000000000" spike-mask-fill1s.log
66+
grep "v8 0x00000000000000000000000000000000" spike-mask-fill1s.log
67+
grep "v9 0x00000000000000000000000000000000" spike-mask-fill1s.log
68+
grep "v10 0x00000000000000000000000000000000" spike-mask-fill1s.log
8369
$INSTALL/bin/spike -l --log-commits --isa=rv64gcv_xspiketama_xspiketa1s test-spiketama1s-ext &> spike-tail-fill1s.log
8470
grep "v2 0x00000000000000000000000000000002" spike-tail-fill1s.log
8571
grep "v3 0xffffffff000000000000000000000003" spike-tail-fill1s.log
72+
grep "v4 0x00000000000000000000000000000000" spike-tail-fill1s.log
73+
grep "v5 0x00000000000000000000000000000000" spike-tail-fill1s.log
74+
grep "v6 0x00000000000000000000000000000000" spike-tail-fill1s.log
75+
grep "v8 0x00000000000000000000000000000000" spike-tail-fill1s.log
76+
grep "v9 0x00000000000000000000000000000000" spike-tail-fill1s.log
77+
grep "v10 0xffffffffffffffff0000000000000000" spike-tail-fill1s.log
78+
grep "v11 0xffffffffffffffffffffffffffffffff" spike-tail-fill1s.log
8679
$INSTALL/bin/spike -l --log-commits --isa=rv64gcv test-spiketama1s-ext &> spike-undisturbed.log
8780
grep "v2 0x00000000000000000000000000000002" spike-undisturbed.log
8881
grep "v3 0x00000000000000000000000000000003" spike-undisturbed.log
82+
grep "v4 0x00000000000000000000000000000000" spike-undisturbed.log
83+
grep "v5 0x00000000000000000000000000000000" spike-undisturbed.log
84+
grep "v6 0x00000000000000000000000000000000" spike-undisturbed.log
85+
grep "v8 0x00000000000000000000000000000000" spike-undisturbed.log
86+
grep "v9 0x00000000000000000000000000000000" spike-undisturbed.log
87+
grep "v10 0x00000000000000000000000000000000" spike-undisturbed.log
8988
LD_LIBRARY_PATH=$INSTALL/lib ./test-libriscv $BUILD/pk/pk hello | grep "Hello, world! Pi is approximately 3.141588."
9089
LD_LIBRARY_PATH=$INSTALL/lib ./test-customext $BUILD/pk/pk dummy-slliuw | grep "Executed successfully"
9190
LD_LIBRARY_PATH=$INSTALL/lib ./test-custom-csr $BUILD/pk/pk customcsr | grep "Executed successfully"

‎ci-tests/test-spiketama1s-ext.S‎

Lines changed: 16 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -23,172 +23,39 @@ _entry:
2323
// Tail undisturbed, mask agnostic with VL = 3
2424
vsetivli a0, 3, e32, m1, tu, ma
2525
vmclr.m v0
26-
// Mask v0 - 0x00000000000000010000000100000001
26+
// Mask v0 - 0b...001
2727
vadd.vi v0, v0, 1
2828
// Fourth element should be zero because of tu
2929
// If mask fill 1s extension (xspikema1s) enable:
30-
// Second and third elements should be 0xffffffff because of 0001 mask
30+
// Second and third elements should be 0xffffffff because of 001 mask
3131
// v2 0x00000000ffffffffffffffff00000002
3232
// If mask fill 1s extension (xspikema1s) disable:
33-
// Second and third elements should be zero because of 0001 mask
33+
// Second and third elements should be zero because of 001 mask
3434
// v2 0x00000000000000000000000000000002
35-
vadd.vi v2, v2, 2, v0.t
35+
vadd.vv v2, v0, v0, v0.t
3636

3737
//----------------------------TAIL AGNOSTIC TEST-------------------------------
3838
vsetivli a0, 3, e32, m1, ta, mu
39-
// Second and third elements should be zero because of 0001 mask with mu
39+
// Second and third elements should be zero because of 001 mask with mu
4040
// If tail fill 1s extension (xspiketa1s) enable:
4141
// Fourth element should be 0xffffffff because of ta
4242
// v3 0xffffffff000000000000000000000003
4343
// If tail fill 1s extension (xspiketa1s) disable:
4444
// Fourth element should be zero because of ta
4545
// v3 0x00000000000000000000000000000003
46-
vadd.vi v3, v3, 3, v0.t
46+
vadd.vv v3, v2, v0, v0.t
4747

48-
//-----------------------------VCOMPRESS.VM TEST-------------------------------
49-
// Tail agnostic, mask undisturbed with VL = 8
50-
vsetivli a0, 8, e8, m1, ta, mu
48+
//---------------------------MASK AGNOSTIC M4 TEST-----------------------------
49+
vsetivli a0, 5, e64, m4, tu, ma
5150
vmclr.m v0
52-
vadd.vi v0, v0, 13
53-
// Mask v0 - 0b...00001101 => 3 setting bits (of the first 8) => 3 elements
54-
// packed, remaining elements - tail: v4 0xffffffffffffffffffffffffff000000
55-
vcompress.vm v4, v1, v0
56-
57-
//-----------------------------MASK LOGICAL TEST-------------------------------
58-
// Tail undisturbed, mask agnostic with VL = 14
59-
vsetivli a0, 14, e8, m1, tu, ma
60-
// Mask destination => unmasked, tail-agnostic
61-
// v5 0xffffffffffffffffffffffffffffc000
62-
vmand.mm v5, v5, v5
63-
64-
//--------------------------SCALAR DESTINATION TEST----------------------------
65-
vsetivli a0, 8, e8, m1, ta, ma
66-
// t1 = x6, check that v6 hasn't been changed
67-
vcpop.m t1, v1, v0.t
68-
69-
//-------------------------------VIOTA.M TEST----------------------------------
70-
// Tail agnostic, mask agnostic with VL = 5
71-
vsetivli a0, 5, e16, m1, ta, ma
72-
vmclr.m v0
73-
vadd.vi v0, v0, 13
74-
// Mask v0 - 0b...00001101
75-
// packed, remaining elements - tail: v7 0xffffffffffffffff00000000ffff0000
76-
viota.m v7, v1, v0.t
77-
78-
//--------------------------------VMV.S.X TEST---------------------------------
79-
// Only first element updated, remaining elements - tail:
80-
// v8 0xffffffffffffffffffffffffffff0000
81-
vmv.s.x v8, sp
82-
83-
//---------------------------------VLM.V TEST----------------------------------
84-
// Tail agnostic, mask agnostic with VL = 31
85-
vsetivli a0, 31, e32, m8, tu, ma
86-
// For all loads, we will use this address of the executable section (so that
87-
// the bytes are unambiguous) placed in the sp.
88-
li sp, 0x00000000800000c4
89-
// Destination register is always written with a tail-agnostic policy.
90-
// evl = ceil(vl / 8) = 3, eew = 8 => tail starts from third element
91-
// v9 0xffffffffffffffffffffffffff410113
92-
vlm.v v9, 0(sp)
93-
94-
//--------------------------VECTOR UNIT-STRIDE TEST----------------------------
95-
// Tail agnostic, mask agnostic with VL = 5
96-
vsetivli a0, 5, e8, m1, ta, ma
97-
vmclr.m v0
98-
vadd.vi v0, v0, 13
99-
// Mask v0 - 0b...00001101
100-
// Masked vector loads do not update inactive elements.
101-
// eew = 16, sew = 8 ignored.
102-
// v10 0xffffffffffff000002b1048700000113
103-
// v11 0xffffffffffffffffffffffffffffffff
104-
vle16.v v10, 0(sp), v0.t
105-
106-
//----------------------------VECTOR STRIDED TEST------------------------------
107-
// Tail agnostic, mask agnostic with VL = 3
108-
vsetivli a0, 3, e16, m1, ta, ma
109-
// Mask v0 - 0b...00001101
110-
li tp, 2
111-
// Masked vector loads do not update inactive elements.
112-
// eew = 32, sew = 16 ignored.
113-
// v12 0xffffffff02b10487000000000c410113
114-
// v13 0xffffffffffffffffffffffffffffffff
115-
vlse32.v v12, 0(sp), tp, v0.t
116-
117-
//----------------------------VECTOR INDEXED TEST------------------------------
118-
// Tail agnostic, mask agnostic with VL = 6
119-
vsetivli a0, 6, e32, m2, ta, ma
120-
// Mask v0 - 0b...00011101
121-
li tp, 29
122-
vmv.s.x v0, tp
123-
// Masked vector loads do not update inactive elements.
124-
// eew = sew = 32
125-
// v14 0x0c4101130c410113000000000c410113
126-
// v15 0xffffffffffffffff000000000c410113
127-
vloxei8.v v14, 0(sp), v1, v0.t
128-
129-
//------------------VECTOR UNIT-STRIDE FAULT-ONLY-FIRST TEST-------------------
130-
// Tail agnostic, mask agnostic with VL = 31
131-
vsetivli a0, 31, e8, m2, ta, ma
132-
// Mask v0 - 0b...001111
133-
li tp, 15
134-
// For all fault-only-first loads, we will use this address, because a few
135-
// bytes after it (0x00000000ffffffff), a trap happens.
136-
vmv.s.x v0, tp
137-
li tp, 0x00000000fffffffa
138-
// Load instructions may overwrite active destination vector register group
139-
// elements past the element index at which the trap is reported.
140-
// Here element with index 3 raised an exception => vl reduced to 3.
141-
// eew = 16, sew = 8 ignored.
142-
// v16 0xffffffffffffffffffff000000000000
143-
// v17 0xffffffffffffffffffffffffffffffff
144-
// v18 0xffffffffffffffffffffffffffffffff
145-
// v19 0xffffffffffffffffffffffffffffffff
146-
vle16ff.v v16, (tp), v0.t
147-
148-
//----------------------VECTOR UNIT-STRIDE SEGMENT TEST------------------------
149-
// Tail agnostic, mask agnostic with VL = 6
150-
vsetivli a0, 6, e32, m2, ta, ma
151-
// Mask v0 - 0b...0001101
152-
li t0, 13
153-
vmv.s.x v0, t0
154-
// Masked vector loads do not update inactive elements.
155-
// nf = 3
156-
// v20 0xffffffff000000000206205700000113
157-
// v21 0xffffffff0000000055076e0000000c41
158-
// v22 0xffffffff000000000001b05700000487
159-
vlseg3e16.v v20, 0(sp), v0.t
160-
161-
//-------------VECTOR UNIT-STRIDE SEGMENT FAULT-ONLY-FIRST TEST----------------
162-
// Tail agnostic, mask agnostic with VL = 14
163-
vsetivli a0, 14, e8, m1, ta, ma
164-
// nf = 2, vl reduced to 3.
165-
// v24 0xffffffffffffffffffffffffff000000
166-
// v25 0xffffffffffffffffffffffffff000000
167-
vlseg2e8ff.v v24, (tp), v0.t
168-
169-
//------------------------VECTOR STRIDED SEGMENT TEST--------------------------
170-
// Tail agnostic, mask agnostic with VL = 7
171-
vsetivli a0, 7, e32, m2, ta, ma
172-
// Mask v0 - 0b...0001101
173-
// Masked vector loads do not update inactive elements.
174-
li t1, 8
175-
// nf = 4
176-
// v26 0xffff000000000000f557b05700000113
177-
// v27 0xffff000000000000cc81020600000c41
178-
// v28 0xffff0000000000000213550700000487
179-
// v29 0xffff00000000000000200001000002b1
180-
vlsseg4e16.v v26, 0(sp), t1, v0.t
181-
182-
//------------------------VECTOR INDEXED SEGMENT TEST--------------------------
183-
// Tail agnostic, mask agnostic with VL = 2
184-
vsetivli a0, 2, e32, m1, ta, ma
185-
// Mask v0 - 0b...00001
186-
vmclr.m v0
187-
vadd.vi v0, v0, 1
188-
// Masked vector loads do not update inactive elements.
189-
// v30 0xffffffffffffffff000000000c410113
190-
// v31 0xffffffffffffffff0000000002b10487
191-
vluxseg2ei32.v v30, 0(sp), v1, v0.t
51+
// Mask v0 - 0b...11001
52+
vadd.vi v0, v0, -7
53+
vadd.vv v4, v4, v4, v0.t
54+
55+
//---------------------------TAIL AGNOSTIC M4 TEST-----------------------------
56+
vsetivli a0, 5, e64, m4, ta, mu
57+
// Mask v0 - 0b...11001
58+
vadd.vv v8, v8, v8, v0.t
19259

19360
//---------------------------------END TESTING---------------------------------
19461
la t0, exit

0 commit comments

Comments
 (0)