Changes in / [ec5d599:7c1144b]

Files:

• Jenkins/Distribute (modified) (5 diffs)
• Jenkins/tools.groovy (modified) (3 diffs)
• Jenkinsfile (modified) (7 diffs)
• tests/.expect/KRfunctions.nast.x86.txt (deleted)
• tests/.expect/KRfunctions.oast.x86.txt (deleted)
• tests/.expect/KRfunctions.x86.txt (added)
• tests/.expect/attributes.nast.x86.txt (deleted)
• tests/.expect/attributes.oast.x86.txt (deleted)
• tests/.expect/attributes.x86.txt (added)
• tests/.expect/functions.nast.x86.txt (deleted)
• tests/.expect/functions.oast.x86.txt (deleted)
• tests/.expect/functions.x86.txt (added)
• tests/.expect/manipulatorsOutput2.arm64.txt (modified) (1 diff)
• tests/errors/.expect/completeType.nast.x86.txt (deleted)
• tests/errors/.expect/completeType.oast.x86.txt (deleted)
• tests/errors/.expect/completeType.x86.txt (added)
• tests/meta/.expect/archVast.nast.x86.txt (modified) (2 diffs)
• tests/meta/.expect/archVast.oast.x86.txt (modified) (2 diffs)

Jenkins/Distribute

@@ -26 +26 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        final commit, build
-                        (commit, build) = prepare_build()
+                        final commit = prepare_build()
 
                         node('x64') {
@@ -36 +35 @@
 
                                 Tools.Checkout( commit )
-
-                                final version = GetVersion( build )
                         }
 
@@ -77 +74 @@
 // Main compilation routines
 //===========================================================================================================
-def GetVersion(build) {
-        final pver = sh(
-                returnStdout: true,
-                script: "sed 's/AC_INIT(\\[cfa-cc\\],\\[\\(.*\\)\\],\\[cforall@plg.uwaterloo.ca\\])/\\1/;t;d' ${SrcDir}/configure.ac"
-        ).trim()
 
-        final version = "${pver}.${build}"
 
-        echo "Package Version: ${pver}"
-        echo "Build   Version: ${build}"
-        echo "Long    Version: ${version}"
+//Compilation script is done here but environnement set-up and error handling is done in main loop
+// def checkout() {
+//      build_stage('Checkout', true) {
+//              //checkout the source code and clean the repo
+//              final scmVars = checkout scm
+//              Settings.GitNewRef = scmVars.GIT_COMMIT
+//              Settings.GitOldRef = scmVars.GIT_PREVIOUS_COMMIT
 
-        return version
-}
-
+//              echo GitLogMessage()
+//      }
+// }
 
 //===========================================================================================================
@@ -112 +107 @@
                                         defaultValue: '',                                                               \
                                 ],                                                                                              \
-                                [$class: 'StringParameterDefinition',                                           \
-                                        description: 'Build Number to put into the version',                    \
-                                        name: 'Build',                                                                  \
-                                        defaultValue: '0',                                                              \
-                                ],                                                                                              \
                         ],
                 ]])
@@ -131 +121 @@
         echo "Distributing git commit ${ref}"
 
-        return [params.GitRef, params.Build]
+        return params.GitRef
 }
 

Jenkins/tools.groovy

@@ -37 +37 @@
                 //checkout the source code and clean the repo
                 if(commitHash) {
-                        echo "Checking out commit <${commitHash}>"
-                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: commitHash ]],
-                                userRemoteConfigs: [[
-                                        url: 'cforall@plg.uwaterloo.ca:software/cfa/cfa-cc',
-                                        credentialsId: 'git_key_aug20']]
-                        ])
+                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: commitHash ]]])
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
                 } else {
+
                         final scmVars = checkout scm
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
@@ -65 +61 @@
 }
 
-PrevGitOldRef = ''
-PrevGitNewRef = ''
-def GitLogMessage(String oldRef = '', String newRef = '') {
-        if (!oldRef) { if(!PrevGitOldRef) { return "\nERROR retrieveing current git information!\n"  } else { oldRef = PrevGitOldRef } }
-        if (!newRef) { if(!PrevGitNewRef) { return "\nERROR retrieveing previous git information!\n" } else { newRef = PrevGitNewRef } }
-
+def GitLogMessage(String oldRef, String newRef) {
         def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
         def revList = SplitLines( revText )
@@ -90 +81 @@
         gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
         gitDiff = gitDiff.replace('[m', '</span>')
-
-        PrevGitOldRef = oldRef
-        PrevGitNewRef = newRef
 
         return """

Jenkinsfile

@@ -30 +30 @@
                                 SrcDir    = pwd tmp: false
 
-                                Tools.Clean()
-
-                                Tools.Checkout()
+                                clean()
+
+                                checkout()
 
                                 build()
@@ -81 +81 @@
 // Main compilation routines
 //===========================================================================================================
+def clean() {
+        Tools.BuildStage('Cleanup', true) {
+                // clean the build by wipping the build directory
+                dir(BuildDir) {
+                        deleteDir()
+                }
+        }
+}
+
+//Compilation script is done here but environnement set-up and error handling is done in main loop
+def checkout() {
+        Tools.BuildStage('Checkout', true) {
+                //checkout the source code and clean the repo
+                final scmVars = checkout scm
+                Settings.GitNewRef = scmVars.GIT_COMMIT
+                Settings.GitOldRef = scmVars.GIT_PREVIOUS_COMMIT
+
+                echo GitLogMessage()
+        }
+}
+
 def build() {
         debug = true
@@ -215 +236 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
+@NonCPS
+def SplitLines(String text) {
+        def list = []
+
+        text.eachLine {
+                list += it
+        }
+
+        return list
+}
+
+def GitLogMessage() {
+        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
+
+        def oldRef = Settings.GitOldRef
+        def newRef = Settings.GitNewRef
+
+        def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
+        def revList = SplitLines( revText )
+
+        def gitUpdate = ""
+        revList.each { rev ->
+                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
+        }
+
+        def rev = oldRef
+        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+        gitUpdate = gitUpdate + "      from  ${rev} (${type})"
+
+        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}").trim()
+
+        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}").trim()
+        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
+        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
+        gitDiff = gitDiff.replace('[m', '</span>')
+
+        return """
+<pre>
+The branch ${env.BRANCH_NAME} has been updated.
+${gitUpdate}
+</pre>
+
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
+
+<p>- Status --------------------------------------------------------------</p>
+
+<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
+
+<p>- Log -----------------------------------------------------------------</p>
+
+<pre>
+${gitLog}
+</pre>
+
+<p>-----------------------------------------------------------------------</p>
+<pre>
+Summary of changes:
+${gitDiff}
+</pre>
+"""
+}
+
 //Standard build email notification
 def email(boolean log) {
@@ -226 +310 @@
 generated because of a git hooks/post-receive script following
 a ref change which was pushed to the C\u2200 repository.</p>
-""" + Tools.GitLogMessage()
+""" + GitLogMessage()
 
         def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
@@ -336 +420 @@
                 this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
 
-                final ast = this.NewAST ? "New AST" : "Old AST"
                 this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
-AST Version             : ${ ast.toString() }
 Architecture            : ${ this.Architecture.name }
 Arc Flags               : ${ this.Architecture.flags }
@@ -391 +473 @@
                                         description: 'If true, build compiler using new AST',           \
                                         name: 'NewAST',                                                                         \
-                                        defaultValue: true,                                                             \
+                                        defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
@@ -397 +479 @@
                                         name: 'RunAllTests',                                                            \
                                         defaultValue: false,                                                            \
-                                ],                                                                                              \
+                                ],
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also runs benchmarks',           \

tests/.expect/manipulatorsOutput2.arm64.txt

@@ -1 +1 @@
 
 0b0 0b11011 0b11011 0b11011 0b11011
-0b11100101 0b1111111111100101 0b11111111111111111111111111100101 0b1111111111111111111111111111111111111111111111111111111111100101
+0b11100101 0b1111111111100101 0b11111111111111111111111111100101 0b11111111111111111111111111100101
 0 033 033 033 033
-0345 0177745 037777777745 01777777777777777777745
+0345 0177745 037777777745 037777777745
 0 0x1b 0x1b 0x1b 0x1b
-0xe5 0xffe5 0xffffffe5 0xffffffffffffffe5
-0x0p+0. 0x1.b8p+4 0x1.b8p+4 0x1.b8p+4
--0x1.b8p+4 -0x1.b8p+4 -0x1.b8p+4
+0xe5 0xffe5 0xffffffe5 0xffffffe5
+0x0p+0. 0x1.b8p+4 0x1.b8p+4 0xd.cp+1
+-0x1.b8p+4 -0x1.b8p+4 -0xd.cp+1
 0.000000e+00 2.750000e+01 -2.750000e+01
 0B11011 0X1B 2.75E-09 0X1.B8P+4

tests/meta/.expect/archVast.nast.x86.txt

@@ -7 +7 @@
   char Alternatives are:
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: double
+      Variable Expression: FX86: signed int
       ... with resolved type:
-        double
+        signed int
     ... to:
       char
@@ -39 +39 @@
 
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: signed int
+      Variable Expression: FX86: double
       ... with resolved type:
-        signed int
+        double
     ... to:
       char

tests/meta/.expect/archVast.oast.x86.txt

@@ -7 +7 @@
   char Alternatives are:
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: double
+      Variable Expression: FX86: function
+        accepting unspecified arguments
+      ... returning nothing
+
       with resolved type:
-        double
+        pointer to function
+          accepting unspecified arguments
+        ... returning nothing
+
     ... to:
       char
@@ -20 +26 @@
 
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: function
-        accepting unspecified arguments
-      ... returning nothing
-
+      Variable Expression: FX86: double
       with resolved type:
-        pointer to function
-          accepting unspecified arguments
-        ... returning nothing
-
+        double
     ... to:
       char