From 2d142a6c013f7eaa87ece56cb415fc1239245ab8 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 23 Sep 2021 15:47:52 +1000 Subject: [PATCH] tests/misc: Add a store/dcbz test We have a bug where an store near a dcbz can cause the dcbz to only zero 8 bytes. Add a test case for this. Signed-off-by: Anton Blanchard --- tests/misc/head.S | 42 ++++++++++++++++++++++++++++++++++++ tests/misc/misc.c | 8 +++++++ tests/test_misc.bin | Bin 5844 -> 5908 bytes tests/test_misc.console_out | 1 + 4 files changed, 51 insertions(+) diff --git a/tests/misc/head.S b/tests/misc/head.S index 025f226..ec48c26 100644 --- a/tests/misc/head.S +++ b/tests/misc/head.S @@ -215,3 +215,45 @@ test_icbi: nop addi %r3,%r3,1 blr + + .global test_dcbz_near_store +test_dcbz_near_store: + li %r0,-1 + addi %r10,%r1,-64 + # cacheline align stack pointer + srdi %r10,%r10,6 + sldi %r10,%r10,6 + + std %r0,0(%r10) + std %r0,8(%r10) + std %r0,16(%r10) + std %r0,24(%r10) + std %r0,32(%r10) + std %r0,40(%r10) + std %r0,48(%r10) + std %r0,56(%r10) + + li %r3,0xa5 + # Store to same cacheline as dcbz, although it doesn't seem + # necessary to hit the issue. + std %r3,0(%r10) + dcbz 0,%r10 + + ld %r0,0(%r10) + ld %r3,8(%r10) + ld %r4,16(%r10) + ld %r5,24(%r10) + ld %r6,32(%r10) + ld %r7,40(%r10) + ld %r8,48(%r10) + ld %r9,56(%r10) + + or %r3,%r3,%r0 + or %r3,%r3,%r4 + or %r3,%r3,%r5 + or %r3,%r3,%r6 + or %r3,%r3,%r7 + or %r3,%r3,%r8 + or %r3,%r3,%r9 + + blr diff --git a/tests/misc/misc.c b/tests/misc/misc.c index d5eb12e..4773f83 100644 --- a/tests/misc/misc.c +++ b/tests/misc/misc.c @@ -17,6 +17,7 @@ extern long test_mtpvr(void); extern long test_bdnzl(void); extern long test_loadhitstore(void); extern long test_icbi(void); +extern long test_dcbz_near_store(void); // i < 100 void print_test_number(int i) @@ -82,5 +83,12 @@ int main(void) } else puts(PASS); + print_test_number(8); + if (test_dcbz_near_store() != 0) { + fail = 1; + puts(FAIL); + } else + puts(PASS); + return fail; } diff --git a/tests/test_misc.bin b/tests/test_misc.bin index 0897d85a4404b8e19b81011c15c2d1870f58a218..5350aa3677bbe55379646e900a30b6e573e14d26 100755 GIT binary patch delta 661 zcmZ9IODIH97{|YJCYfY(?|3#AX7YY^%cJX6CXx)YAS*RoD|?!$n~NPgj+BLL*r+KQ zONp&)Mi#On7MDC`VR1c=@0wG_J@woC&cFY6zH?E(*05Jb4bDM5=E2s*M1ORur9TRg zWw{XvDMI{66`~+2vIAiiVA^^d10A!b8>USOmdzsAHT`gER>6ab*?Sdg?jtTukCY;{ zNF&mYbR!{6_rv@U0K_ZlxMx*r@>nyPDgm()JYemxpi~&}xS$Uc;o+pAE1;p!yTkkQMMu%d+!{!nzAF=XPi0o7fJ2l#^P!$u223IA2_lJ zkyRj|Mm}zh>n|R%_XOP2jeG8k`)%y8z3n!IJ4`v_S1t*8nHHQ8?lsL#2$#+O3I~NN zOLMKlb)>m+;YQHmPuYjellZ!~jnL#r{5;o3srkm9^DA<@-Z}4~80gJW`rGPPGM-p8&djE>!*kR2(GM2^D*R zBvuL)WBCu!4^o#16;nWn8Cm#31uYPQ7M4)403-0