* Some changes in PKE tests, as per SCEI e-mail. t-pke1 still fails, but

  will ignore this until next SCEI clarification.

	* tsv308_1.trc: Fixed test case as per SCEI email.
	* tsv316_1.trc: Ditto.
	* tsv408_1.trc: Same.
	* tsv416_1.trc: Again.
	* t-pke3.trc: Added more padding to one VU test to widen timing race.

6 files changed, 35 insertions, 23 deletions

diff --git a/sim/testsuite/sky/ChangeLog b/sim/testsuite/sky/ChangeLog
index f376b98..e0d2133 100644
--- a/sim/testsuite/sky/ChangeLog
+++ b/sim/testsuite/sky/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar 16 19:04:26 1998  Frank Ch. Eigler  <fche@cygnus.com>
+
+	* tsv308_1.trc: Fixed test case as per SCEI email.
+	* tsv316_1.trc: Ditto.
+	* tsv408_1.trc: Same.
+	* tsv416_1.trc: Again.
+	* t-pke3.trc: Added more padding to one VU test to widen timing race.
+
 Fri Mar 13 20:34:13 1998  Frank Ch. Eigler  <fche@cygnus.com>
 
 	* tss*.trc: New files, generated by perl script from
diff --git a/sim/testsuite/sky/t-pke3.trc b/sim/testsuite/sky/t-pke3.trc
index d1103ed..9f86b34 100644
--- a/sim/testsuite/sky/t-pke3.trc
+++ b/sim/testsuite/sky/t-pke3.trc
@@ -482,15 +482,19 @@
 # Load a bunch of NOP[e]/NOP instructions into the VU
 # 0x000002ff_8000033c == NOP NOP
 # 0x400002ff_8000033c == NOP[e] NOP
-# MPG 10 instructions
-1 0x4a0a0000_00000000_00000000_00000000 0x00000000 PPPP
+# MPG 18 instructions
+1 0x4a120001_00000000_00000000_00000000 0x00000000 PPPP
+1 0x000002ff_8000033c_000002ff_8000033c 0x00000000 ....
+1 0x000002ff_8000033c_000002ff_8000033c 0x00000000 ....
+1 0x000002ff_8000033c_000002ff_8000033c 0x00000000 ....
+1 0x000002ff_8000033c_000002ff_8000033c 0x00000000 ....
 1 0x000002ff_8000033c_000002ff_8000033c 0x00000000 ....
 1 0x000002ff_8000033c_000002ff_8000033c 0x00000000 ....
 1 0x000002ff_8000033c_400002ff_8000033c 0x00000000 ....
 1 0x400002ff_8000033c_000002ff_8000033c 0x00000000 ....
 1 0x400002ff_8000033c_000002ff_8000033c 0x00000000 ....
 # Start VU; FLUSH
-1 0x10000000_14000000_00000000_00000000 0x00000000 PPPP
+1 0x14000000_14000000_00000000_00000000 0x00000000 PPPP
 # Assert PEW bit on while waiting for VU
 ? 0x10003c00 0x00000004 0x00000004
 # Send a few more NOPs to let VU get to first END
diff --git a/sim/testsuite/sky/tsv308_1.trc b/sim/testsuite/sky/tsv308_1.trc
index d79b9da..5902e1c 100644
--- a/sim/testsuite/sky/tsv308_1.trc
+++ b/sim/testsuite/sky/tsv308_1.trc
@@ -481,23 +481,23 @@
 ? 0x110047a8 0x00000037 0xffffffff
 ? 0x110047ac 0x00000002 0xffffffff
 ? 0x110047b0 0x00000004 0xffffffff
-? 0x110047b4 0x00000135 0xffffffff
+? 0x110047b4 0x00000102 0xffffffff
 ? 0x110047b8 0x00000069 0xffffffff
 ? 0x110047bc 0x00000003 0xffffffff
 ? 0x110047c0 0x00000005 0xffffffff
-? 0x110047c4 0x00000277 0xffffffff
+? 0x110047c4 0x00000200 0xffffffff
 ? 0x110047c8 0x000000ab 0xffffffff
 ? 0x110047cc 0x00000000 0xffffffff
 ? 0x110047d0 0x00000006 0xffffffff
-? 0x110047d4 0x00000279 0xffffffff
+? 0x110047d4 0x00000202 0xffffffff
 ? 0x110047d8 0x000000fd 0xffffffff
 ? 0x110047dc 0x00000001 0xffffffff
 ? 0x110047e0 0x00000007 0xffffffff
-? 0x110047e4 0x0000027c 0xffffffff
+? 0x110047e4 0x00000205 0xffffffff
 ? 0x110047e8 0x0000015f 0xffffffff
 ? 0x110047ec 0x00000002 0xffffffff
 ? 0x110047f0 0x00000008 0xffffffff
-? 0x110047f4 0x000003ee 0xffffffff
+? 0x110047f4 0x00000300 0xffffffff
 ? 0x110047f8 0x000001d1 0xffffffff
 ? 0x110047fc 0x00000003 0xffffffff
 ? 0x11004800 0x0000ffff 0xffffffff
diff --git a/sim/testsuite/sky/tsv316_1.trc b/sim/testsuite/sky/tsv316_1.trc
index 0f40e86..c632ac3 100644
--- a/sim/testsuite/sky/tsv316_1.trc
+++ b/sim/testsuite/sky/tsv316_1.trc
@@ -497,23 +497,23 @@
 ? 0x110047a8 0x00000037 0xffffffff
 ? 0x110047ac 0x00000002 0xffffffff
 ? 0x110047b0 0x00000004 0xffffffff
-? 0x110047b4 0x00010035 0xffffffff
+? 0x110047b4 0x00010002 0xffffffff
 ? 0x110047b8 0x00000069 0xffffffff
 ? 0x110047bc 0x00000003 0xffffffff
 ? 0x110047c0 0x00000005 0xffffffff
-? 0x110047c4 0x00020077 0xffffffff
+? 0x110047c4 0x00020000 0xffffffff
 ? 0x110047c8 0x000000ab 0xffffffff
 ? 0x110047cc 0x00000000 0xffffffff
 ? 0x110047d0 0x00000006 0xffffffff
-? 0x110047d4 0x00020079 0xffffffff
+? 0x110047d4 0x00020002 0xffffffff
 ? 0x110047d8 0x000000fd 0xffffffff
 ? 0x110047dc 0x00000001 0xffffffff
 ? 0x110047e0 0x00000007 0xffffffff
-? 0x110047e4 0x0002007c 0xffffffff
+? 0x110047e4 0x00020005 0xffffffff
 ? 0x110047e8 0x0000015f 0xffffffff
 ? 0x110047ec 0x00000002 0xffffffff
 ? 0x110047f0 0x00000008 0xffffffff
-? 0x110047f4 0x000300ee 0xffffffff
+? 0x110047f4 0x00030000 0xffffffff
 ? 0x110047f8 0x000001d1 0xffffffff
 ? 0x110047fc 0x00000003 0xffffffff
 ? 0x11004800 0x0000ffff 0xffffffff
diff --git a/sim/testsuite/sky/tsv408_1.trc b/sim/testsuite/sky/tsv408_1.trc
index ba095d2..46c908a 100644
--- a/sim/testsuite/sky/tsv408_1.trc
+++ b/sim/testsuite/sky/tsv408_1.trc
@@ -532,23 +532,23 @@
 ? 0x110047a8 0x00000037 0xffffffff
 ? 0x110047ac 0x00000002 0xffffffff
 ? 0x110047b0 0x00000004 0xffffffff
-? 0x110047b4 0x00000136 0xffffffff
+? 0x110047b4 0x00000102 0xffffffff
 ? 0x110047b8 0x00000069 0xffffffff
 ? 0x110047bc 0x00000003 0xffffffff
 ? 0x110047c0 0x00000005 0xffffffff
-? 0x110047c4 0x00000279 0xffffffff
+? 0x110047c4 0x00000200 0xffffffff
 ? 0x110047c8 0x000000ab 0xffffffff
 ? 0x110047cc 0x00000000 0xffffffff
 ? 0x110047d0 0x00000006 0xffffffff
-? 0x110047d4 0x0000027b 0xffffffff
+? 0x110047d4 0x00000202 0xffffffff
 ? 0x110047d8 0x000000fd 0xffffffff
 ? 0x110047dc 0x00000001 0xffffffff
 ? 0x110047e0 0x00000007 0xffffffff
-? 0x110047e4 0x0000027e 0xffffffff
+? 0x110047e4 0x00000205 0xffffffff
 ? 0x110047e8 0x0000015f 0xffffffff
 ? 0x110047ec 0x00000002 0xffffffff
 ? 0x110047f0 0x00000008 0xffffffff
-? 0x110047f4 0x000003f1 0xffffffff
+? 0x110047f4 0x00000300 0xffffffff
 ? 0x110047f8 0x000001d1 0xffffffff
 ? 0x110047fc 0x00000003 0xffffffff
 ? 0x11004800 0x0000ffff 0xffffffff
diff --git a/sim/testsuite/sky/tsv416_1.trc b/sim/testsuite/sky/tsv416_1.trc
index 23fe6fb..7ec18d8 100644
--- a/sim/testsuite/sky/tsv416_1.trc
+++ b/sim/testsuite/sky/tsv416_1.trc
@@ -553,23 +553,23 @@
 ? 0x110047a8 0x00000037 0xffffffff
 ? 0x110047ac 0x00000002 0xffffffff
 ? 0x110047b0 0x00000004 0xffffffff
-? 0x110047b4 0x00010036 0xffffffff
+? 0x110047b4 0x00010002 0xffffffff
 ? 0x110047b8 0x00000069 0xffffffff
 ? 0x110047bc 0x00000003 0xffffffff
 ? 0x110047c0 0x00000005 0xffffffff
-? 0x110047c4 0x00020079 0xffffffff
+? 0x110047c4 0x00020000 0xffffffff
 ? 0x110047c8 0x000000ab 0xffffffff
 ? 0x110047cc 0x00000000 0xffffffff
 ? 0x110047d0 0x00000006 0xffffffff
-? 0x110047d4 0x0002007b 0xffffffff
+? 0x110047d4 0x00020002 0xffffffff
 ? 0x110047d8 0x000000fd 0xffffffff
 ? 0x110047dc 0x00000001 0xffffffff
 ? 0x110047e0 0x00000007 0xffffffff
-? 0x110047e4 0x0002007e 0xffffffff
+? 0x110047e4 0x00020005 0xffffffff
 ? 0x110047e8 0x0000015f 0xffffffff
 ? 0x110047ec 0x00000002 0xffffffff
 ? 0x110047f0 0x00000008 0xffffffff
-? 0x110047f4 0x000300f1 0xffffffff
+? 0x110047f4 0x00030000 0xffffffff
 ? 0x110047f8 0x000001d1 0xffffffff
 ? 0x110047fc 0x00000003 0xffffffff
 ? 0x11004800 0x0000ffff 0xffffffff