From 330ee14a232389e1d12c936d3d361a827ad84f65 Mon Sep 17 00:00:00 2001 From: Dolu1990 Date: Fri, 17 Aug 2018 19:13:23 +0200 Subject: [PATCH] final fetchRework commit ? --- src/main/scala/vexriscv/demo/Murax.scala | 2 +- src/test/python/gcloud/remoteTest.py | 2 +- src/test/python/gcloud/run.sh | 2 +- src/test/resources/freertos/dynamic_rv32i_O0.hex | 2 +- src/test/resources/freertos/dynamic_rv32i_O3.hex | 4 ++-- src/test/resources/freertos/dynamic_rv32ic_O0.hex | 2 +- src/test/resources/freertos/dynamic_rv32ic_O3.hex | 4 ++-- src/test/resources/freertos/dynamic_rv32im_O3.hex | 4 ++-- src/test/resources/freertos/dynamic_rv32imac_O3.hex | 4 ++-- src/test/scala/vexriscv/TestIndividualFeatures.scala | 11 +++++------ 10 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/scala/vexriscv/demo/Murax.scala b/src/main/scala/vexriscv/demo/Murax.scala index 38edcac..1dd97a5 100644 --- a/src/main/scala/vexriscv/demo/Murax.scala +++ b/src/main/scala/vexriscv/demo/Murax.scala @@ -57,7 +57,7 @@ object MuraxConfig{ relaxedPcCalculation = true, prediction = NONE, catchAccessFault = false, - compressedGen = false + compressedGen = true ), new DBusSimplePlugin( catchAddressMisaligned = false, diff --git a/src/test/python/gcloud/remoteTest.py b/src/test/python/gcloud/remoteTest.py index 244a306..551fbb1 100755 --- a/src/test/python/gcloud/remoteTest.py +++ b/src/test/python/gcloud/remoteTest.py @@ -6,7 +6,7 @@ from sys import argv from gcloud import GCInstance gci = GCInstance("vexriscv") -gci.create("n1-highcpu-8","") +gci.create("n1-highcpu-8") gci.start() gci.stopHours(20) gci.stopScript("src/test/python/gcloud/stopScript.sh") diff --git a/src/test/python/gcloud/run.sh b/src/test/python/gcloud/run.sh index 25a6bf8..7281216 100644 --- a/src/test/python/gcloud/run.sh +++ b/src/test/python/gcloud/run.sh @@ -4,7 +4,7 @@ mkdir VexRiscv tar -xzf archive.tar.gz -C VexRiscv cd VexRiscv -export VEXRISCV_REGRESSION_CONFIG_COUNT=32 +export VEXRISCV_REGRESSION_CONFIG_COUNT=16 export VEXRISCV_REGRESSION_FREERTOS_COUNT=yes sbt test cd .. diff --git a/src/test/resources/freertos/dynamic_rv32i_O0.hex b/src/test/resources/freertos/dynamic_rv32i_O0.hex index 4ef725a..d6d6856 100644 --- a/src/test/resources/freertos/dynamic_rv32i_O0.hex +++ b/src/test/resources/freertos/dynamic_rv32i_O0.hex @@ -1844,7 +1844,7 @@ :107320008328C100E398A8FC0325C10013030500CE :107330009303000013170300930600000325810048 :107340009305050013060000B3E7B6003368C700D5 -:10735000370710F0130587F4B7150000938505FA79 +:10735000370710F0130587F4B715000093850577FC :1073600013060000B386B70093880600B3B8F80090 :107370003307C800B387E800138707009387060028 :10738000130807002320F500232205011300000045 diff --git a/src/test/resources/freertos/dynamic_rv32i_O3.hex b/src/test/resources/freertos/dynamic_rv32i_O3.hex index afaf5aa..12d5142 100644 --- a/src/test/resources/freertos/dynamic_rv32i_O3.hex +++ b/src/test/resources/freertos/dynamic_rv32i_O3.hex @@ -1772,11 +1772,11 @@ :106EA000EFF04F9B8327C100238007000325C1001B :106EB0008320C102330585400324810213010105AB :106EC00067800000B70710F083A647F403A607F415 -:106ED00003A747F4E31AD7FEB7160000938606FA15 +:106ED00003A747F4E31AD7FEB71600009386067798 :106EE000B306D60033B6C600B305E60023A4D7F434 :106EF00023A6B7F467800000B70710F003A747F494 :106F000003A607F483A647F4E31AD7FEB7160000DA -:106F1000938606FAB306D60033B6C60023A4D7F488 +:106F100093860677B306D60033B6C60023A4D7F40B :106F2000B305E60023A6B7F49307000873A0473023 :106F300067800000130101FF232481002326110034 :106F4000979701009387476717940100130484669D diff --git a/src/test/resources/freertos/dynamic_rv32ic_O0.hex b/src/test/resources/freertos/dynamic_rv32ic_O0.hex index 3592fc9..7e3fb2e 100644 --- a/src/test/resources/freertos/dynamic_rv32ic_O0.hex +++ b/src/test/resources/freertos/dynamic_rv32ic_O0.hex @@ -1148,7 +1148,7 @@ :1047A000370510F0130545F40841B248E39EA8FC14 :1047B00032452A8381431317030081462245AA8587 :1047C0000146B3E7B6003368C700370710F013059A -:1047D00087F48565938505FA0146B386B700B688E8 +:1047D00087F48565938505770146B386B700B6886B :1047E000B3B8F8003307C800B387E8003E87B68740 :1047F0003A881CC123220501010041018280411138 :1048000006C651379307000873A047300100B24035 diff --git a/src/test/resources/freertos/dynamic_rv32ic_O3.hex b/src/test/resources/freertos/dynamic_rv32ic_O3.hex index 9196694..6452f12 100644 --- a/src/test/resources/freertos/dynamic_rv32ic_O3.hex +++ b/src/test/resources/freertos/dynamic_rv32ic_O3.hex @@ -1239,10 +1239,10 @@ :104D5000C2C4C6C61ACEEFF06FD4B2472380070094 :104D60003245B250018D225461618280B70710F044 :104D700083A647F403A607F403A747F4E31AD7FE74 -:104D80008566938606FAB29633B6C600B305E6008A +:104D8000856693860677B29633B6C600B305E6000D :104D900023A4D7F423A6B7F48280B70710F003A7A3 :104DA00047F403A607F483A647F4E31AD7FE856603 -:104DB000938606FAB29633B6C60023A4D7F4B30599 +:104DB00093860677B29633B6C60023A4D7F4B3051C :104DC000E60023A6B7F49307000873A0473082805B :104DD000411122C406C697B701009387E77D17B437 :104DE00001001304247D98431C401306F07C9306B5 diff --git a/src/test/resources/freertos/dynamic_rv32im_O3.hex b/src/test/resources/freertos/dynamic_rv32im_O3.hex index 051766e..e6375a5 100644 --- a/src/test/resources/freertos/dynamic_rv32im_O3.hex +++ b/src/test/resources/freertos/dynamic_rv32im_O3.hex @@ -1770,10 +1770,10 @@ :106E80008327C100238007000325C1008320C1029E :106E9000330585400324810213010105678000004A :106EA000B70710F083A647F403A607F403A747F437 -:106EB000E31AD7FEB7160000938606FAB306D6008B +:106EB000E31AD7FEB716000093860677B306D6000E :106EC00033B6C600B305E60023A4D7F423A6B7F46F :106ED00067800000B70710F003A747F403A607F484 -:106EE00083A647F4E31AD7FEB7160000938606FA86 +:106EE00083A647F4E31AD7FEB71600009386067709 :106EF000B306D60033B6C60023A4D7F4B305E60024 :106F000023A6B7F49307000873A0473067800000FA :106F1000130101FF2324810023261100979701000C diff --git a/src/test/resources/freertos/dynamic_rv32imac_O3.hex b/src/test/resources/freertos/dynamic_rv32imac_O3.hex index 2708a89..f02f837 100644 --- a/src/test/resources/freertos/dynamic_rv32imac_O3.hex +++ b/src/test/resources/freertos/dynamic_rv32imac_O3.hex @@ -1237,10 +1237,10 @@ :104D3000BEC236DEBAC0C2C4C6C61ACEEFF06FD449 :104D4000B247238007003245B250018D2254616181 :104D50008280B70710F083A647F403A607F403A7E1 -:104D600047F4E31AD7FE8566938606FAB29633B601 +:104D600047F4E31AD7FE856693860677B29633B684 :104D7000C600B305E60023A4D7F423A6B7F48280C7 :104D8000B70710F003A747F403A607F483A647F478 -:104D9000E31AD7FE8566938606FAB29633B6C60046 +:104D9000E31AD7FE856693860677B29633B6C600C9 :104DA00023A4D7F4B305E60023A6B7F493070008BD :104DB00073A047308280411122C406C697B7010014 :104DC0009387C77317B401001304047398431C40FE diff --git a/src/test/scala/vexriscv/TestIndividualFeatures.scala b/src/test/scala/vexriscv/TestIndividualFeatures.scala index 804744b..9bb8045 100644 --- a/src/test/scala/vexriscv/TestIndividualFeatures.scala +++ b/src/test/scala/vexriscv/TestIndividualFeatures.scala @@ -462,7 +462,7 @@ class TestIndividualFeatures extends FunSuite { new HazardDimension, new RegFileDimension, new SrcDimension, - new CsrDimension(sys.env.getOrElse("VEXRISCV_REGRESSION_FREERTOS_COUNT", "yes")), //todo restore yes to 4 ? + new CsrDimension(sys.env.getOrElse("VEXRISCV_REGRESSION_FREERTOS_COUNT", "4")), new DecoderDimension, new DebugDimension ) @@ -522,10 +522,9 @@ class TestIndividualFeatures extends FunSuite { // val seed = -2412372746600605141l -// val testId = Some(mutable.HashSet[Int](32)) -// val seed = -1807241812308067688l +// val testId = Some(mutable.HashSet[Int](6)) +// val seed = 157974189776419693l - //TODO restore all mai n.cpp rtos tests and restore config count in gcloud val rand = new Random(seed) @@ -533,7 +532,7 @@ class TestIndividualFeatures extends FunSuite { println(s"MAIN_SEED=$seed") } println(s"Seed=$seed") - for(i <- 0 until sys.env.getOrElse("VEXRISCV_REGRESSION_CONFIG_COUNT", "200").toInt){ + for(i <- 0 until sys.env.getOrElse("VEXRISCV_REGRESSION_CONFIG_COUNT", "100").toInt){ var positions : List[VexRiscvPosition] = null val universe = VexRiscvUniverse.universes.filter(e => rand.nextBoolean()) :+ VexRiscvUniverse.CATCH_ALL //TODO @@ -545,7 +544,7 @@ class TestIndividualFeatures extends FunSuite { if(testId.isEmpty || testId.get.contains(i)) doTest(positions," random_" + i + "_", testSeed) } -//TODO main.cpp freertos + // println(s"${usedPositions.size}/$positionsCount positions") // for (dimension <- dimensions) {