Merge branch 'nitely-nim_regex'

Author: mariomka

Dockerfile

@@ -14,7 +14,8 @@ RUN apt-get update && \
         software-properties-common \
         tzdata \
         unzip \
-        wget
+        wget \
+        git
 
 # Set the locale and timezone
 RUN locale-gen en_US.UTF-8 && \
@@ -92,7 +93,8 @@ RUN wget -q https://github.com/JetBrains/kotlin/releases/download/v1.3.50/kotlin
 
 ## Nim
 RUN curl https://nim-lang.org/choosenim/init.sh -sSf | sh -s -- -y && \
-    ln -s /root/.nimble/bin/nim /usr/local/bin/nim
+    ln -s /root/.nimble/bin/nim /usr/local/bin/nim && \
+    /root/.nimble/bin/nimble install regex -y
 
 ## PHP
 RUN apt-get install -yq --no-install-recommends \
@@ -107,18 +109,18 @@ RUN apt-get install -yq --no-install-recommends \
         python3.6
 
 ## Pyhton2 - PyPy2
-RUN wget -q https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.2.0-linux64.tar.bz2 -O pypy2.7-v7.2.0-linux64.tar.bz2 && \
-    tar -x -C /opt -f pypy2.7-v7.2.0-linux64.tar.bz2 && \
-    mv /opt/pypy2.7-v7.2.0-linux64 /opt/pypy2 && \
+RUN wget -q https://downloads.python.org/pypy/pypy2.7-v7.3.3-linux64.tar.bz2 -O pypy2.7-v7.3.3-linux64.tar.bz2 && \
+    tar -x -C /opt -f pypy2.7-v7.3.3-linux64.tar.bz2 && \
+    mv /opt/pypy2.7-v7.3.3-linux64 /opt/pypy2 && \
     ln -s /opt/pypy2/bin/pypy /usr/local/bin/pypy2 && \
-    rm pypy2.7-v7.2.0-linux64.tar.bz2
+    rm pypy2.7-v7.3.3-linux64.tar.bz2
 
 ## Pyhton3 - PyPy3
-RUN wget -q https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.2.0-linux64.tar.bz2 -O pypy3.6-v7.2.0-linux64.tar.bz2 && \
-    tar -x -C /opt -f pypy3.6-v7.2.0-linux64.tar.bz2 && \
-    mv /opt/pypy3.6-v7.2.0-linux64 /opt/pypy3 && \
+RUN wget -q https://downloads.python.org/pypy/pypy3.6-v7.3.3-linux64.tar.bz2 -O pypy3.6-v7.3.3-linux64.tar.bz2 && \
+    tar -x -C /opt -f pypy3.6-v7.3.3-linux64.tar.bz2 && \
+    mv /opt/pypy3.6-v7.3.3-linux64 /opt/pypy3 && \
     ln -s /opt/pypy3/bin/pypy3 /usr/local/bin/pypy3 && \
-    rm pypy3.6-v7.2.0-linux64.tar.bz2
+    rm pypy3.6-v7.3.3-linux64.tar.bz2
 
 ## Ruby
 RUN apt-get install -yq --no-install-recommends \

nim/benchmark_regex.nim

@@ -0,0 +1,25 @@
+import times
+import os
+import strformat
+
+import pkg/regex
+
+if paramCount() == 0:
+  echo "Usage: ./benchmark <filename>"
+  quit(QuitFailure)
+
+proc measure(data: string, pattern: string) =
+  let time = cpuTime()
+  let r_pattern = re(pattern)
+  let matches = data.findAll(r_pattern)
+  let count = len(matches)
+  let elapsed_time = cpuTime() - time 
+  echo &"{elapsed_time * 1e3} - {count}"
+
+let data = readFile(paramStr(1))
+
+measure(data, r"[\w\.+-]+@[\w\.-]+\.[\w\.-]+")
+
+measure(data, r"[\w]+://[^/\s?#]+[^\s?#]+(?:\?[^\s#]*)?(?:#[^\s]*)?")
+
+measure(data, r"(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9])")

run-benchmarks.php

@@ -14,10 +14,11 @@
     'D dmd'        => 'dmd -O -release -inline -of=d/bin/benchmark d/benchmark.d',
     'D ldc'        => 'ldc2 -O3 -release -of=d/bin/benchmark-ldc d/benchmark.d',
     'Dart Native'  => 'mkdir -p /var/regex/dart/bin && dart2native dart/benchmark.dart -o dart/bin/benchmark',
-    'Go'           => 'go build -ldflags "-s -w" -o go/bin/benchmark ./go',
+    'Go'           => 'go env -w GO111MODULE=auto && go build -ldflags "-s -w" -o go/bin/benchmark ./go',
     'Java'         => 'javac java/Benchmark.java',
     'Kotlin'       => 'kotlinc kotlin/benchmark.kt -include-runtime -d kotlin/benchmark.jar',
     'Nim'          => 'nim c -d:release --opt:speed --verbosity:0 -o:nim/bin/benchmark nim/benchmark.nim',
+    'Nim Regex'    => 'nim c -d:release --opt:speed --verbosity:0 -o:nim/bin/benchmark_regex nim/benchmark_regex.nim',
     'Rust'         => 'cargo build --quiet --release --manifest-path=rust/Cargo.toml',
 ];
 
@@ -37,6 +38,7 @@
     'Javascript'   => 'node javascript/benchmark.js',
     'Kotlin'       => 'kotlin kotlin/benchmark.jar',
     'Nim'          => 'nim/bin/benchmark',
+    'Nim Regex'    => 'nim/bin/benchmark_regex',
     'Perl'         => 'perl perl/benchmark.pl',
     'PHP'          => 'php php/benchmark.php',
     'Python 2'     => 'python2.7 python/benchmark.py',