Iroha build time graph per each g++ target

Signed-off-by: Alexey Rodionov <[email protected]>

.jenkinsci-new/build.groovy

@@ -13,7 +13,7 @@ def cmakeConfigure(String buildDir, String cmakeOptions, String sourceTreeDir=".
 }
 
 def cmakeBuild(String buildDir, String cmakeOptions, int parallelism) {
-  sh "cmake --build ${buildDir} ${cmakeOptions} -- -j${parallelism}"
+  sh "cmake --build ${buildDir} ${cmakeOptions} -- -j${parallelism} | sponge buildTimeResult.txt"
   sh "ccache --show-stats"
 }
 

.jenkinsci-new/builders/x64-linux-build-steps.groovy

@@ -131,9 +131,23 @@ def buildSteps(int parallelism, List compilerVersions, String build_type, boolea
   }
 }
 
-def successPostSteps(scmVars, boolean packagePush, String dockerTag, List environment) {
+def successPostSteps(scmVars, boolean packagePush, String dockerTag, List environment, boolean buildTimeGraph) {
   stage('Linux success PostSteps') {
     withEnv(environment) {
+
+      // handling build time results
+      if (buildTimeGraph) {
+        sh(".jenkinsci-new/helpers/exportBuildTime.py buildTimeResult.txt")
+        zip archive: true, dir: '', glob: 'buildTimeResult.csv', zipFile: 'buildTimeMeasurement.zip'
+        archiveArtifacts artifacts: 'buildTimeMeasurement.zip'
+
+        copyArtifacts(projectName: 'develop', filter: 'buildTimeMeasurement.zip', target: 'buildTimeMeasurement-develop');
+        unzip zipFile: 'buildTimeMeasurement-develop/buildTimeMeasurement.zip', dir: 'buildTimeMeasurement-develop'
+        sh ".jenkinsci-new/helpers/analyzeBuildTime.py buildTimeMeasurement-develop/buildTimeResult.csv buildTimeResult.csv"
+        zip archive: true, dir: '', glob: 'diff.csv', zipFile: 'diff.zip'
+        archiveArtifacts artifacts: 'diff.zip'
+      }
+
       if (packagePush) {
         def artifacts = load ".jenkinsci-new/artifacts.groovy"
         def utils = load ".jenkinsci-new/utils/utils.groovy"

.jenkinsci-new/helpers/analyzeBuildTime.py

@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+#
+# Analyzes build time per each iroha build target (g++ target) and stores all results to csv-file:
+# target, work_type, sys_time, user_time, total, sys_time_diff, user_time_diff, total_diff, sys_time_perc, user_time_perc, total_perc
+#
+
+import csv
+from sys import argv
+from os import path
+
+F1, F2 = argv[1], argv[2] # base, compare
+
+# time difference in seconds (multiply by -1 show difference - faster or lower)
+def diff_secs(a, b):
+    return round( (float(a) - float(b)) * -1 , 2)
+
+# time difference in percents (multiply by -1 show difference - faster or lower)
+def diff_perc(a, b):
+    if float(a) == 0.0:
+        return 0.0
+    return round( (float(a) - float(b)) / float(a) * 100 * -1, 2)
+
+if __name__ == '__main__':
+    if not path.isfile(F1) or not path.isfile(F2):
+        print("Can't find files!")
+        exit(1)
+
+    with open(F1) as base, open(F2) as compare:
+        base_reader, comp_reader = csv.DictReader(base), csv.DictReader(compare)
+        b, c = { row['target']: row for row in base_reader }, { row['target']: row for row in comp_reader }
+
+    if len(c) == 0:
+        print("No records found")
+        exit(1)
+
+    for target in c:
+        c[target].update( 
+            { 'user_time_diff': 0, 'sys_time_diff': 0, 'total_diff': 0, 
+              'user_time_perc': 0, 'sys_time_perc': 0, 'total_perc': 0 } 
+        )
+        if b[target] is None:
+            continue
+        c[target]['sys_time_diff']  = diff_secs(b[target]['sys_time'], c[target]['sys_time'])
+        c[target]['user_time_diff'] = diff_secs(b[target]['user_time'], c[target]['user_time'])
+        c[target]['total_diff']     = diff_secs(b[target]['total'],  c[target]['total'])
+        c[target]['sys_time_perc']  = diff_perc(b[target]['sys_time'], c[target]['sys_time'])
+        c[target]['user_time_perc'] = diff_perc(b[target]['user_time'], c[target]['user_time'])
+        c[target]['total_perc']     = diff_perc(b[target]['total'],  c[target]['total'])
+
+    with open ('diff.csv', 'w+') as csvfile:
+        fieldnames = ['target', 'work_type', 
+            'sys_time', 'user_time', 'total', 
+            'sys_time_diff', 'user_time_diff', 'total_diff', 
+            'sys_time_perc', 'user_time_perc', 'total_perc'
+        ]
+        # fieldnames = sorted(next(iter(c.iteritems()))[1].keys())
+        writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+        writer.writeheader()
+        for row in c:
+            writer.writerow(c[row])

.jenkinsci-new/helpers/compilers/clang++-6.0.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+( /usr/bin/time -f "%S\t%U" clang++-6.0 "${@}" 2> >(cat <(echo "clang++-6.0 ${@}") - )) | sponge

.jenkinsci-new/helpers/compilers/clang++-7.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+( /usr/bin/time -f "%S\t%U" clang++-7 "${@}" 2> >(cat <(echo "clang++-7 ${@}") - )) | sponge

.jenkinsci-new/helpers/compilers/clang++.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+( /usr/bin/time -f "%S\t%U" clang++ "${@}" 2> >(cat <(echo "clang++ ${@}") - )) | sponge

.jenkinsci-new/helpers/compilers/g++-5.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+( /usr/bin/time -f "%S\t%U" g++-5 "${@}" 2> >(cat <(echo "g++-5 ${@}") - )) | sponge

.jenkinsci-new/helpers/compilers/g++-7.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+( /usr/bin/time -f "%S\t%U" g++-7 "${@}" 2> >(cat <(echo "g++-7 ${@}") - )) | sponge

.jenkinsci-new/helpers/exportBuildTime.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+#
+# Compares 2 csv files with build time data, makes new file with difference in seconds and percents
+#
+
+import re
+import argparse
+import csv
+
+parser = argparse.ArgumentParser(description='Process time output for compiler')
+
+parser.add_argument('log_file', type=str, help='input file')
+
+args = parser.parse_args()
+if __name__ == "__main__":
+    lines = []
+    with open(args.log_file, "r") as f:
+        lines = f.readlines()
+    i = 0
+    units = []
+    while i < len(lines):
+        unit = {}
+        if "g++" not in lines[i]:
+            i+=1
+            continue
+        try:
+            sys_time, user_time = lines[i+1].rstrip().split("\t")
+            unit['target'] = re.findall(r"-o (\S+) ", lines[i])[0]
+            unit['work_type'] = 'linking' if "-Wl" in lines[i] else "build"
+            unit['sys_time'] = float(sys_time)
+            unit['user_time'] = float(user_time)
+            unit['total'] = round(unit['sys_time'] + unit['user_time'], 2)
+            units.append(unit)
+            i+=2
+        except:
+            i+=1
+            continue
+
+    csv_filename = args.log_file.split(".")[0] + ".csv"
+    with open(csv_filename, 'w') as csvfile:
+        fieldnames = ['target', 'sys_time', 'user_time', 'total', 'work_type']
+        writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+        writer.writeheader()
+        writer.writerows(units)

.jenkinsci-new/utils/vars.groovy

@@ -9,11 +9,11 @@
 //
 
 def compilerMapping () {
-  return ['gcc5': ['cxx_compiler':'g++-5', 'cc_compiler':'gcc-5'],
-          'gcc7' : ['cxx_compiler':'g++-7', 'cc_compiler':'gcc-7'],
-          'clang6': ['cxx_compiler':'clang++-6.0', 'cc_compiler':'clang-6.0'],
-          'clang7': ['cxx_compiler':'clang++-7', 'cc_compiler':'clang-7'],
-          'appleclang': ['cxx_compiler':'clang++', 'cc_compiler':'clang'],
+  return ['gcc5': ['cxx_compiler':"${WORKSPACE}/.jenkinsci-new/helpers/compilers/g++-5.sh", 'cc_compiler':'gcc-5'],
+          'gcc7' : ['cxx_compiler':"${WORKSPACE}/.jenkinsci-new/helpers/compilers/g++-7.sh", 'cc_compiler':'gcc-7',],
+          'clang6': ['cxx_compiler':"${WORKSPACE}/.jenkinsci-new/helpers/compilers/clang++-6.0.sh", 'cc_compiler':'clang-6.0'],
+          'clang7': ['cxx_compiler':"${WORKSPACE}/.jenkinsci-new/helpers/compilers/clang++-7.sh", 'cc_compiler':'clang-7'],
+          'appleclang': ['cxx_compiler':"${WORKSPACE}/.jenkinsci-new/helpers/compilers/clang++.sh", 'cc_compiler':'clang'],
          ]
   }
 

.jenkinsci/debug-build.groovy

@@ -66,7 +66,7 @@ def doDebugBuild(coverageEnabled=false) {
     + " -v /tmp/${GIT_COMMIT}-${BUILD_NUMBER}:/tmp/${GIT_COMMIT}") {
 
     def scmVars = checkout scm
-    def cmakeOptions = ""
+    def cmakeOptions = "-DCMAKE_CXX_COMPILER=${WORKSPACE}/.jenkinsci/helpers/build.sh"
     if ( coverageEnabled ) {
       cmakeOptions += " -DCOVERAGE=ON "
     }
@@ -95,7 +95,7 @@ def doDebugBuild(coverageEnabled=false) {
         -DIROHA_VERSION=${env.IROHA_VERSION} \
         ${cmakeOptions}
     """
-    sh "cmake --build build -- -j${parallelism}"
+    sh "cmake --build build -- -j${parallelism} | sponge buildTimeResult.txt"
     sh "ccache --show-stats"
     if ( coverageEnabled ) {
       sh "cmake --build build --target coverage.init.info"

.jenkinsci/helpers/analyzeBuildTime.py

@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+#
+# Analyzes build time per each iroha build target (g++ target) and stores all results to csv-file:
+# target, work_type, sys_time, user_time, total, sys_time_diff, user_time_diff, total_diff, sys_time_perc, user_time_perc, total_perc
+#
+
+import csv
+from sys import argv
+from os import path
+
+F1, F2 = argv[1], argv[2] # base, compare
+
+# time difference in seconds (multiply by -1 show difference - faster or lower)
+def diff_secs(a, b):
+    return round( (float(a) - float(b)) * -1 , 2)
+
+# time difference in percents (multiply by -1 show difference - faster or lower)
+def diff_perc(a, b):
+    if float(a) == 0.0:
+        return 0.0
+    return round( (float(a) - float(b)) / float(a) * 100 * -1, 2)
+
+if __name__ == '__main__':
+    if not path.isfile(F1) or not path.isfile(F2):
+        print("Can't find files!")
+        exit(1)
+
+    with open(F1) as base, open(F2) as compare:
+        base_reader, comp_reader = csv.DictReader(base), csv.DictReader(compare)
+        b, c = { row['target']: row for row in base_reader }, { row['target']: row for row in comp_reader }
+
+    if len(c) == 0:
+        print("No records found")
+        exit(1)
+
+    for target in c:
+        c[target].update( 
+            { 'user_time_diff': 0, 'sys_time_diff': 0, 'total_diff': 0, 
+              'user_time_perc': 0, 'sys_time_perc': 0, 'total_perc': 0 } 
+        )
+        if b[target] is None:
+            continue
+        c[target]['sys_time_diff']  = diff_secs(b[target]['sys_time'], c[target]['sys_time'])
+        c[target]['user_time_diff'] = diff_secs(b[target]['user_time'], c[target]['user_time'])
+        c[target]['total_diff']     = diff_secs(b[target]['total'],  c[target]['total'])
+        c[target]['sys_time_perc']  = diff_perc(b[target]['sys_time'], c[target]['sys_time'])
+        c[target]['user_time_perc'] = diff_perc(b[target]['user_time'], c[target]['user_time'])
+        c[target]['total_perc']     = diff_perc(b[target]['total'],  c[target]['total'])
+
+    with open ('diff.csv', 'w+') as csvfile:
+        fieldnames = ['target', 'work_type', 
+            'sys_time', 'user_time', 'total', 
+            'sys_time_diff', 'user_time_diff', 'total_diff', 
+            'sys_time_perc', 'user_time_perc', 'total_perc'
+        ]
+        # fieldnames = sorted(next(iter(c.iteritems()))[1].keys())
+        writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+        writer.writeheader()
+        for row in c:
+            writer.writerow(c[row])

.jenkinsci/helpers/build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+( /usr/bin/time -f "%S\t%U" g++ "$@" 2> >(cat <(echo "g++ $@") - )) | sponge

.jenkinsci/helpers/build_cmake.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+( /usr/bin/time -f "%S\t%U" g++ "$@" 2> >(cat <(echo "g++ $@") - )) | sponge

.jenkinsci/helpers/exportBuildTime.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+#
+# Compares 2 csv files with build time data, makes new file with difference in seconds and percents
+#
+
+import re
+import argparse
+import csv
+
+parser = argparse.ArgumentParser(description='Process time output for compiler')
+
+parser.add_argument('log_file', type=str, help='input file')
+
+args = parser.parse_args()
+if __name__ == "__main__":
+    lines = []
+    with open(args.log_file, "r") as f:
+        lines = f.readlines()
+    i = 0
+    units = []
+    while i < len(lines):
+        unit = {}
+        if "g++" not in lines[i]:
+            i+=1
+            continue
+        try:
+            sys_time, user_time = lines[i+1].rstrip().split("\t")
+            unit['target'] = re.findall(r"-o (\S+) ", lines[i])[0]
+            unit['work_type'] = 'linking' if "-Wl" in lines[i] else "build"
+            unit['sys_time'] = float(sys_time)
+            unit['user_time'] = float(user_time)
+            unit['total'] = round(unit['sys_time'] + unit['user_time'], 2)
+            units.append(unit)
+            i+=2
+        except:
+            i+=1
+            continue
+
+    csv_filename = args.log_file.split(".")[0] + ".csv"
+    with open(csv_filename, 'w') as csvfile:
+        fieldnames = ['target', 'sys_time', 'user_time', 'total', 'work_type']
+        writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+        writer.writeheader()
+        writer.writerows(units)

.jenkinsci/helpers/platform_tag.py

@@ -1,4 +1,8 @@
 #!/usr/env/python
+#
+# Copyright Soramitsu Co., Ltd. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
 import xml.etree.ElementTree as ET
 import argparse
 

.jenkinsci/linux-post-step.groovy

@@ -3,6 +3,7 @@ def linuxPostStep() {
     try {
       // stop write core dumps
       sh "ulimit -c 0"
+
       // handling coredumps (if tests crashed)
       if (currentBuild.currentResult != "SUCCESS" && params.coredump) {
         def dumpsFileName = sprintf('coredumps-%1$s.bzip2',
@@ -16,6 +17,20 @@ def linuxPostStep() {
           echo "Build is not SUCCESS! See core dumps at: https://nexus.iroha.tech/repository/artifacts/iroha/coredumps/${dumpsFileName}"
         }
       }
+
+      // handling build time results
+      if (currentBuild.currentResult == "SUCCESS" && !params.fuzzing) {
+        sh(".jenkinsci/helpers/exportBuildTime.py buildTimeResult.txt")
+        zip archive: true, dir: '', glob: 'buildTimeResult.csv', zipFile: 'buildTimeMeasurement.zip'
+        archiveArtifacts artifacts: 'buildTimeMeasurement.zip'
+
+        copyArtifacts(projectName: 'develop', filter: 'buildTimeMeasurement.zip', target: 'buildTimeMeasurement-develop');
+        unzip zipFile: 'buildTimeMeasurement-develop/buildTimeMeasurement.zip', dir: 'buildTimeMeasurement-develop'
+        sh ".jenkinsci/helpers/analyzeBuildTime.py buildTimeMeasurement-develop/buildTimeResult.csv buildTimeResult.csv"
+        zip archive: true, dir: '', glob: 'diff.csv', zipFile: 'diff.zip'
+        archiveArtifacts artifacts: 'diff.zip'
+      }
+
       if (currentBuild.currentResult == "SUCCESS" && GIT_LOCAL_BRANCH ==~ /(master|develop)/) {
         def artifacts = load ".jenkinsci/artifacts.groovy"
         def commit = env.GIT_COMMIT

Jenkinsfile-new

@@ -145,7 +145,8 @@ node ('master') {
   coverage = false
   coverage_mac = false
   doxygen = false
-
+  buildTimeGraph = true
+
   build_type = 'Debug'
   packageBuild = false
   pushDockerTag = 'not-supposed-to-be-pushed'
@@ -262,9 +263,12 @@ node ('master') {
       parallelism==0 ?x64LinuxWorker.cpusAvailable : parallelism, x64linux_compiler_list, 'Release', specialBranch, false,
       false , testList, false, false, false, true, false, false, false, environmentList)}]
     }
+    if (build_scenario == 'Before merge to trunk') {
+      buildTimeGraph = false
+    }
     x64LinuxPostSteps = new Builder.PostSteps(
       always: [{x64LinuxBuildScript.alwaysPostSteps(environmentList)}],
-      success: [{x64LinuxBuildScript.successPostSteps(scmVars, packagePush, pushDockerTag, environmentList)}])
+      success: [{x64LinuxBuildScript.successPostSteps(scmVars, packagePush, pushDockerTag, environmentList, buildTimeGraph)}])
   }
   def x64MacBuildSteps
   def x64MacBuildPostSteps = new Builder.PostSteps()

docker/develop/Dockerfile

@@ -9,7 +9,7 @@ ENV IROHA_HOME /opt/iroha
 ENV IROHA_BUILD /opt/iroha/build
 
 RUN apt-get update && \
-    apt-get -y --no-install-recommends install apt-utils software-properties-common wget; \
+    apt-get -y --no-install-recommends install apt-utils software-properties-common wget time moreutils; \
     apt-get -y clean
 
 # add repos