Skip to content

Commit

Permalink
tests update
Browse files Browse the repository at this point in the history
  • Loading branch information
@KonradStaniec
KonradStaniec committed Sep 22, 2017
1 parent 498949c commit 7f2989e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
8 changes: 8 additions & 0 deletions src/test/scala/io/iohk/ethereum/vm/Generators.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ object Generators extends ObjectGenerators {
stack = Stack.empty(maxSize)
} yield stack.push(list)

def getStackLGen(minElems: Int = 0, maxElems: Int = testStackMaxSize, valueGen: Gen[UInt256] = getUInt256Gen(),
maxSize: Int = testStackMaxSize): Gen[StackL] =
for {
size <- Gen.choose(minElems, maxElems)
list <- Gen.listOfN(size, valueGen)
stack = StackL.empty(maxSize)
} yield stack.push(list)

def getStackGen(elems: Int, uint256Gen: Gen[UInt256]): Gen[Stack] =
getStackGen(minElems = elems, maxElems = elems, uint256Gen)

Expand Down
19 changes: 1 addition & 18 deletions src/test/scala/io/iohk/ethereum/vm/StackSpecComp.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ class StackSpecComp extends FunSuite with Matchers with PropertyChecks with Logg

val statsStack = getStats(measures)
val statsStackList = getStats(measuresList)
log.info(s"Time of $results Swap\t: " + sumOfAllRuns(measures) + "ms, for Vector based Stack" )
log.info(s"Avarage time of vector based Swap is : ${statsStack._1} ns, with dev ${statsStack._2}")
log.info(s"Median time of vector based Swap is : ${statsStack._3} ns \n")


log.info(s"Time of $results Swap\t: " + sumOfAllRuns(measuresList) + "ms, for List based Stack")
log.info(s"Avarage time of list based Swap is : ${statsStackList._1} ns, with dev ${statsStackList._2}")
log.info(s"Median time of list based Swap is : ${statsStackList._3} ns \n")
}
Expand Down Expand Up @@ -90,12 +88,10 @@ class StackSpecComp extends FunSuite with Matchers with PropertyChecks with Logg

val statsStack = getStats(measures)
val statsStackList = getStats(measuresList)
log.info(s"Time of $results Dup\t: " + sumOfAllRuns(measures) + "ms, for Vector based Stack" )
log.info(s"Avarage time of vector based Dup is : ${statsStack._1} ns, with dev ${statsStack._2}")
log.info(s"Median time of vector based Dup is : ${statsStack._3} ns \n")


log.info(s"Time of $results Dup\t: " + sumOfAllRuns(measuresList) + "ms, for List based Stack")
log.info(s"Avarage time of list based Dup is : ${statsStackList._1} ns, with dev ${statsStackList._2}")
log.info(s"Median time of list based Dup is : ${statsStackList._3} ns \n")
}
Expand Down Expand Up @@ -124,12 +120,10 @@ class StackSpecComp extends FunSuite with Matchers with PropertyChecks with Logg

val statsStack = getStats(measures)
val statsStackList = getStats(measuresList)
log.info(s"Time of $results Push\t: " + sumOfAllRuns(measures) + "ms, for Vector based Stack" )
log.info(s"Avarage time of vector based Push is : ${statsStack._1} ns, with dev ${statsStack._2}")
log.info(s"Median time of vector based Push is : ${statsStack._3} ns \n")


log.info(s"Time of $results Push\t: " + sumOfAllRuns(measuresList) + "ms, for List based Stack")
log.info(s"Avarage time of list based Push is : ${statsStackList._1} ns, with dev ${statsStackList._2}")
log.info(s"Median time of list based Push is : ${statsStackList._3} ns \n")
}
Expand Down Expand Up @@ -158,12 +152,10 @@ class StackSpecComp extends FunSuite with Matchers with PropertyChecks with Logg

val statsStack = getStats(measures)
val statsStackList = getStats(measuresList)
log.info(s"Time of $results Push\t: " + sumOfAllRuns(measures) + "ms, for Vector based Stack" )
log.info(s"Avarage time of vector based Push is : ${statsStack._1} ns, with dev ${statsStack._2}")
log.info(s"Median time of vector based Push is : ${statsStack._3} ns \n")


log.info(s"Time of $results Push\t: " + sumOfAllRuns(measuresList) + "ms, for List based Stack")
log.info(s"Avarage time of list based Push is : ${statsStackList._1} ns, with dev ${statsStackList._2}")
log.info(s"Median time of list based Push is : ${statsStackList._3} ns \n")

Expand Down Expand Up @@ -196,12 +188,10 @@ class StackSpecComp extends FunSuite with Matchers with PropertyChecks with Logg

val statsStack = getStats(measures)
val statsStackList = getStats(measuresList)
log.info(s"Time of $results Pop\t: " + sumOfAllRuns(measures) + "ms, for Vector based Stack" )
log.info(s"Avarage time of vector based Pop is : ${statsStack._1} ns, with dev ${statsStack._2}")
log.info(s"Median time of vector based Pop is : ${statsStack._3} ns \n")


log.info(s"Time of $results Pop\t: " + sumOfAllRuns(measuresList) + "ms, for List based Stack")
log.info(s"Avarage time of list based Pop is : ${statsStackList._1} ns, with dev ${statsStackList._2}")
log.info(s"Median time of list based Pop is : ${statsStackList._3} ns \n")
}
Expand Down Expand Up @@ -239,19 +229,17 @@ class StackSpecComp extends FunSuite with Matchers with PropertyChecks with Logg

val statsStack = getStats(measures)
val statsStackList = getStats(measuresList)
log.info(s"Time of $results Pop\t: " + sumOfAllRuns(measures) + "ms, for Vector based Stack" )
log.info(s"Avarage time of vector based Pop is : ${statsStack._1} ns, with dev ${statsStack._2}")
log.info(s"Median time of vector based Pop is : ${statsStack._3} ns \n")


log.info(s"Time of $results Pop\t: " + sumOfAllRuns(measuresList) + "ms, for List based Stack")
log.info(s"Avarage time of list based Pop is : ${statsStackList._1} ns, with dev ${statsStackList._2}")
log.info(s"Median time of list based Pop is : ${statsStackList._3} ns \n")
}


private def getStats(list: ListBuffer[Long]) = {
val interval = 500
val interval = 1000
val mid = results / 2

val impres = list.takeRight(results).sorted.slice(mid - interval, mid + interval)
Expand All @@ -262,9 +250,4 @@ class StackSpecComp extends FunSuite with Matchers with PropertyChecks with Logg
val dev = math.sqrt(variance)
(mean, dev, median)
}

private def sumOfAllRuns(list: ListBuffer[Long]): Double = {
list.takeRight(results).sum.toDouble / 1000000.0
}

}

0 comments on commit 7f2989e

Please sign in to comment.