Merge remote-tracking branch 'origin/master' into devel/matrix_init_fix

.gitlab-ci.yml

@@ -21,6 +21,7 @@ stages:
         when: on_failure
         paths:
             - Testing/output/Debug/*
+            - Testing/output/generated/*
         expire_in: 1 weeks
     before_script:
         - java -version
@@ -68,6 +69,7 @@ stages:
         when: on_failure
         paths:
             - Benchmark/output/Debug/*
+            - Benchmark/output/generated/*
         expire_in: 1 weeks
     before_script:
         - java -version
@@ -128,149 +130,86 @@ build:generator:
 # MATRIX TESTS                                #
 ###############################################
 
-# decision about runtime execution of solution of local systems and inversions depending on size/const entries
-test:Matrix_evalMatrixOpRuntimeExecution:
+test:MatrixMisc:
     extends: .test_template
     script:
+        # Matrix_evalMatrixOpRuntimeExecution: decision about runtime execution of solution of local systems and inversions depending on size/const entries
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_evalMatrixOpRuntimeExecution ./MatrixClassTests/evalMOpRuntimeExe/evalMOpRuntimeExe.knowledge "./MatrixClassTests/evalMOpRuntimeExe/evalMOpRuntimeExe.exa4" ./MatrixClassTests/evalMOpRuntimeExe/evalMOpRuntimeExe.RESULTS 1 1 Platform/random.platform output
-
-# classification of matrix shapes/structures
-test:Matrix_determineMatrixStructures:
-    extends: .test_template
-    script:
+        # Matrix_determineMatrixStructures: classification of matrix shapes/structures
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_determineMatrixStructures ./MatrixClassTests/determineMatrixStructures/determineMatrixStructures.knowledge "./MatrixClassTests/determineMatrixStructures/determineMatrixStructures.exa4" ./MatrixClassTests/determineMatrixStructures/determineMatrixStructures.RESULTS 1 1 Platform/random.platform output
-
-# operations on fields with matrices as inner data type
-test:Matrix_matrixFields:
-    extends: .test_template
-    script:
+        # Matrix_matrixFields: operations on fields with matrices as inner data type
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_matrixFields ./MatrixClassTests/matrixFields/matrixFields.knowledge "./MatrixClassTests/matrixFields/matrixFields.exa4" ./MatrixClassTests/matrixFields/matrixFields.RESULTS 1 1 Platform/random.platform output
-
-# shallow water equation in vector form
-test:Matrix_2D_FV_SWE:
-    extends: .test_template
-    script:
+        # Matrix_2D_FV_SWE: shallow water equation in vector form
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_2D_FV_SWE ./MatrixClassTests/2D_FV_SWE/2D_FV_SWE.knowledge "./MatrixClassTests/2D_FV_SWE/2D_FV_SWE.exa4" ./MatrixClassTests/2D_FV_SWE/2D_FV_SWE.RESULTS 1 1 Platform/random.platform output
 
 # built-in operations of matrices
-test:Matrix_slicing:
+test:MatrixOperations:
     extends: .test_template
     script:
+        # Matrix_slicing
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_slicing ./MatrixClassTests/resolvingMatrixFunctions/slicing/slicing.knowledge "./MatrixClassTests/resolvingMatrixFunctions/slicing/slicing.exa4" ./MatrixClassTests/resolvingMatrixFunctions/slicing/slicing.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_chaines:
-    extends: .test_template
-    script:
+        # Matrix_chaines
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_chaines ./MatrixClassTests/resolvingMatrixFunctions/chaines/chaines.knowledge "./MatrixClassTests/resolvingMatrixFunctions/chaines/chaines.exa4" ./MatrixClassTests/resolvingMatrixFunctions/chaines/chaines.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_cross:
-    extends: .test_template
-    script:
+        # Matrix_cross
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_cross ./MatrixClassTests/resolvingMatrixFunctions/cross/cross.knowledge "./MatrixClassTests/resolvingMatrixFunctions/cross/cross.exa4" ./MatrixClassTests/resolvingMatrixFunctions/cross/cross.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_dot:
-    extends: .test_template
-    script:
+        # Matrix_dot
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_dot ./MatrixClassTests/resolvingMatrixFunctions/dot/dot.knowledge "./MatrixClassTests/resolvingMatrixFunctions/dot/dot.exa4" ./MatrixClassTests/resolvingMatrixFunctions/dot/dot.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_trace:
-    extends: .test_template
-    script:
+        # Matrix_trace
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_trace ./MatrixClassTests/resolvingMatrixFunctions/trace/trace.knowledge "./MatrixClassTests/resolvingMatrixFunctions/trace/trace.exa4" ./MatrixClassTests/resolvingMatrixFunctions/trace/trace.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_transpose:
-    extends: .test_template
-    script:
+        # Matrix_transpose
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_transpose ./MatrixClassTests/resolvingMatrixFunctions/transpose/transpose.knowledge "./MatrixClassTests/resolvingMatrixFunctions/transpose/transpose.exa4" ./MatrixClassTests/resolvingMatrixFunctions/transpose/transpose.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_frobeniusNorm:
-    extends: .test_template
-    script:
+        # Matrix_frobeniusNorm
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_frobeniusNorm ./MatrixClassTests/resolvingMatrixFunctions/frobeniusNorm/frobeniusNorm.knowledge "./MatrixClassTests/resolvingMatrixFunctions/frobeniusNorm/frobeniusNorm.exa4" ./MatrixClassTests/resolvingMatrixFunctions/frobeniusNorm/frobeniusNorm.RESULTS 1 1 Platform/random.platform output
 
-# slicing and access of matrices per bracket operator
-test:Matrix_resolvingMatrixAccesses:
-    extends: .test_template
-    script:
-        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_resolvingMatrixAccesses ./MatrixClassTests/resolvingMatrixAccesses/resolvingMatrixAccesses.knowledge "./MatrixClassTests/resolvingMatrixAccesses/resolvingMatrixAccesses.exa4" ./MatrixClassTests/resolvingMatrixAccesses/resolvingMatrixAccesses.RESULTS 1 1 Platform/random.platform output
-
 # direct solution of small linear systems
-test:Matrix_SolveMatSysRunTime:
+test:MatrixSolve:
     extends: .test_template
     script:
+        # Matrix_SolveMatSysRunTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_SolveMatSysRunTime ./MatrixClassTests/SolveMatSys/SolveMatSysRunTime/SolveMatSysRunTime.knowledge "./MatrixClassTests/SolveMatSys/SolveMatSysRunTime/SolveMatSysRunTime.exa4" ./MatrixClassTests/SolveMatSys/SolveMatSysRunTime/SolveMatSysRunTime.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_SolveMatSysCompileTime:
-    extends: .test_template
-    script:
+        # Matrix_SolveMatSysCompileTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_SolveMatSysCompileTime ./MatrixClassTests/SolveMatSys/SolveMatSysCompileTime/SolveMatSysCompileTime.knowledge "./MatrixClassTests/SolveMatSys/SolveMatSysCompileTime/SolveMatSysCompileTime.exa4" ./MatrixClassTests/SolveMatSys/SolveMatSysCompileTime/SolveMatSysCompileTime.RESULTS 1 1 Platform/random.platform output
 
-# arithmetic operators
-test:Matrix_resolvingMatrixOperators:
+test:MatrixResolve:
     extends: .test_template
     script:
+        # Matrix_resolvingMatrixAccesses: slicing and access of matrices per bracket operator
+        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_resolvingMatrixAccesses ./MatrixClassTests/resolvingMatrixAccesses/resolvingMatrixAccesses.knowledge "./MatrixClassTests/resolvingMatrixAccesses/resolvingMatrixAccesses.exa4" ./MatrixClassTests/resolvingMatrixAccesses/resolvingMatrixAccesses.RESULTS 1 1 Platform/random.platform output
+        # Matrix_resolvingMatrixOperators: arithmetic operators
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_resolvingMatrixOperators ./MatrixClassTests/resolvingMatrixOperators/resolvingMatrixOperators.knowledge "./MatrixClassTests/resolvingMatrixOperators/resolvingMatrixOperators.exa4" ./MatrixClassTests/resolvingMatrixOperators/resolvingMatrixOperators.RESULTS 1 1 Platform/random.platform output
 
 # inversion at compiletime
-test:Matrix_LUCompileTime:
+test:MatrixInversionCompileTime:
     extends: .test_template
     script:
+        # Matrix_LUCompileTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_LUCompileTime ./MatrixClassTests/invert/CompileTime/LU/LU.knowledge "./MatrixClassTests/invert/CompileTime/LU/LU.exa4" ./MatrixClassTests/invert/CompileTime/LU/LU.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_BlockDiagonalCompileTime:
-    extends: .test_template
-    script:
+        # Matrix_BlockDiagonalCompileTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_BlockDiagonalCompileTime ./MatrixClassTests/invert/CompileTime/BlockDiagonal/BlockDiagonal.knowledge "./MatrixClassTests/invert/CompileTime/BlockDiagonal/BlockDiagonal.exa4" ./MatrixClassTests/invert/CompileTime/BlockDiagonal/BlockDiagonal.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_DiagonalCompileTime:
-    extends: .test_template
-    script:
+        # Matrix_DiagonalCompileTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_DiagonalCompileTime ./MatrixClassTests/invert/CompileTime/Diagonal/Diagonal.knowledge "./MatrixClassTests/invert/CompileTime/Diagonal/Diagonal.exa4" ./MatrixClassTests/invert/CompileTime/Diagonal/Diagonal.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_SchurCompileTime:
-    extends: .test_template
-    script:
+        # Matrix_SchurCompileTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_SchurCompileTime ./MatrixClassTests/invert/CompileTime/Schur/Schur.knowledge "./MatrixClassTests/invert/CompileTime/Schur/Schur.exa4" ./MatrixClassTests/invert/CompileTime/Schur/Schur.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_SchurWithHelpersCompileTime:
-    extends: .test_template
-    script:
+        # Matrix_SchurWithHelpersCompileTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_SchurWithHelpersCompileTime ./MatrixClassTests/invert/CompileTime/SchurWithHelpers/SchurWithHelpers.knowledge "./MatrixClassTests/invert/CompileTime/SchurWithHelpers/SchurWithHelpers.exa4" ./MatrixClassTests/invert/CompileTime/SchurWithHelpers/SchurWithHelpers.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_smallMatricesCompileTime:
-    extends: .test_template
-    script:
+        # Matrix_smallMatricesCompileTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_smallMatricesCompileTime ./MatrixClassTests/invert/CompileTime/smallMatrices/smallMatrices.knowledge "./MatrixClassTests/invert/CompileTime/smallMatrices/smallMatrices.exa4" ./MatrixClassTests/invert/CompileTime/smallMatrices/smallMatrices.RESULTS 1 1 Platform/random.platform output
 
 # inversion at runtime
-test:Matrix_LURunTime:
+test:MatrixInversionRunTime:
     extends: .test_template
     script:
+        # Matrix_LURunTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_LURunTime ./MatrixClassTests/invert/RunTime/LU/LU.knowledge "./MatrixClassTests/invert/RunTime/LU/LU.exa4" ./MatrixClassTests/invert/RunTime/LU/LU.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_SchurRunTime:
-    extends: .test_template
-    script:
+        # Matrix_SchurRunTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_SchurRunTime ./MatrixClassTests/invert/RunTime/Schur/Schur.knowledge "./MatrixClassTests/invert/RunTime/Schur/Schur.exa4" ./MatrixClassTests/invert/RunTime/Schur/Schur.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_DiagonalRunTime:
-    extends: .test_template
-    script:
+        # Matrix_DiagonalRunTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_DiagonalRunTime ./MatrixClassTests/invert/RunTime/Diagonal/Diagonal.knowledge "./MatrixClassTests/invert/RunTime/Diagonal/Diagonal.exa4" ./MatrixClassTests/invert/RunTime/Diagonal/Diagonal.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_BlockDiagonalRunTime:
-    extends: .test_template
-    script:
+        # Matrix_BlockDiagonalRunTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_BlockDiagonalRunTime ./MatrixClassTests/invert/RunTime/BlockDiagonal/BlockDiagonal.knowledge "./MatrixClassTests/invert/RunTime/BlockDiagonal/BlockDiagonal.exa4" ./MatrixClassTests/invert/RunTime/BlockDiagonal/BlockDiagonal.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_SchurLargeMatrixRunTime:
-    extends: .test_template
-    script:
+        # Matrix_SchurLargeMatrixRunTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_SchurLargeMatrixRunTime ./MatrixClassTests/invert/RunTime/SchurLargeMatrix/SchurLargeMatrix.knowledge "./MatrixClassTests/invert/RunTime/SchurLargeMatrix/SchurLargeMatrix.exa4" ./MatrixClassTests/invert/RunTime/SchurLargeMatrix/SchurLargeMatrix.RESULTS 1 1 Platform/random.platform output
-
-test:Matrix_SmallMatrixRunTime:
-    extends: .test_template
-    script:
+        # Matrix_SmallMatrixRunTime
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Matrix_SmallMatrixRunTime ./MatrixClassTests/invert/RunTime/SmallMatrix/SmallMatrix.knowledge "./MatrixClassTests/invert/RunTime/SmallMatrix/SmallMatrix.exa4" ./MatrixClassTests/invert/RunTime/SmallMatrix/SmallMatrix.RESULTS 1 1 Platform/random.platform output
 
 # Application
@@ -318,51 +257,26 @@ test:Appl_OptFlow3D:
 # BASIC COMMUNICATION TESTS                   #
 ###############################################
 
-test:CommBasic_PureMPI:
+test:Communication:
     extends: .test_template
     script:
+        # CommBasic_PureMPI
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_PureMPI CommBasic/PureMPI.knowledge "CommBasic/PureMPI.exa4" CommBasic/PureMPI.results 27 1 Platform/random.platform output
-
-test:CommBasic_PureOMP:
-    extends: .test_template
-    script:
+        # CommBasic_PureOMP
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_PureOMP CommBasic/PureOMP.knowledge "CommBasic/PureOMP.exa4" CommBasic/PureOMP.results 1 10 Platform/random.platform output
-
-test:CommBasic_Hybrid:
-    extends: .test_template
-    script:
+        # CommBasic_Hybrid
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_Hybrid CommBasic/Hybrid.knowledge "CommBasic/Hybrid.exa4" CommBasic/Hybrid.results 27 2 Platform/random.platform output
-
-test:CommBasic_Summarize:
-    extends: .test_template
-    script:
+        # CommBasic_Summarize
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_Summarize CommBasic/Summarize.knowledge "CommBasic/Summarize.exa4" CommBasic/Summarize.results 27 2 Platform/random.platform output
-
-test:CommBasic_Strategy26:
-    extends: .test_template
-    script:
+        # CommBasic_Strategy26
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_Strategy26 CommBasic/Strategy26.knowledge "CommBasic/Strategy26.exa4" CommBasic/Strategy26.results 27 2 Platform/random.platform output
-
-test:CommBasic_2D:
-    extends: .test_template
-    script:
+        # CommBasic_2D
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_2D CommBasic/2D.knowledge "CommBasic/2D.exa4" CommBasic/2D.results 9 2 Platform/random.platform output
-
-# cell based
-test:CommBasic_HybridCell:
-    extends: .test_template
-    script:
+        # CommBasic_HybridCell
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_HybridCell CommBasic/HybridCell.knowledge "CommBasic/HybridCell.exa4" CommBasic/HybridCell.results 27 2 Platform/random.platform output
-
-test:CommBasic_Strategy26Cell:
-    extends: .test_template
-    script:
+        # CommBasic_Strategy26Cell
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_Strategy26Cell CommBasic/Strategy26Cell.knowledge "CommBasic/Strategy26Cell.exa4" CommBasic/Strategy26Cell.results 27 2 Platform/random.platform output
-
-# complex numbers
-test:CommBasic_complexNumbers:
-    extends: .test_template
-    script:
+        # CommBasic_complexNumbers
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib CommBasic_complexNumbers CommBasic/ComplexNumbers.knowledge "CommBasic/ComplexNumbers.exa4" CommBasic/ComplexNumbers.results 9 2 Platform/random.platform output
 
 ###############################################
@@ -375,234 +289,166 @@ test:CommBasic_complexNumbers:
 ### sequential version
 ## single precision
 
-test:Seq_TestF_naive:
+test:Optimization_Seq_SinglePrec_Naive:
     extends: .test_template
     script:
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_naive Opts/seq__float_naive.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/random.platform output
 
 # SSE3
-test:Seq_TestF_vectS:
+test:Optimization_Seq_SinglePrec_SSE3:
     extends: .test_template
     script:
+        # Seq_TestF_vectS
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vectS Opts/seq__float_vect.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/random.platform output
-
-test:Seq_TestF_vectSAl:
-    extends: .test_template
-    script:
+        # Seq_TestF_vectSAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vectSAl Opts/seq__float_vectAl.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/random.platform output
-
-test:Seq_TestF_vectSAlAl:
-    extends: .test_template
-    script:
+        # Seq_TestF_vectSAlAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vectSAlAl Opts/seq__float_vectAlAl.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/random.platform output
 
 # AVX
-test:Seq_TestF_vect:
+test:Optimization_Seq_SinglePrec_AVX:
     extends: .test_template_AVX
     script:
+        # Seq_TestF_vect
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vect Opts/seq__float_vect.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/anyavx.platform output
-
-test:Seq_TestF_vectAl:
-    extends: .test_template_AVX
-    script:
+        # Seq_TestF_vectAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vectAl Opts/seq__float_vectAl.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/anyavx.platform output
-
-test:Seq_TestF_vectAlAl:
-    extends: .test_template_AVX
-    script:
+        # Seq_TestF_vectAlAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vectAlAl Opts/seq__float_vectAlAl.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/anyavx.platform output
 
 # AVX2
-test:Seq_TestF_vect2:
+test:Optimization_Seq_SinglePrec_AVX2:
     extends: .test_template_AVX2
     script:
+        # Seq_TestF_vect2
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vect2 Opts/seq__float_vect.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/anyavx2.platform output
-
-test:Seq_TestF_vect2Al:
-    extends: .test_template_AVX2
-    script:
+        # Seq_TestF_vect2Al
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vect2Al Opts/seq__float_vectAl.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/anyavx2.platform output
-
-test:Seq_TestF_vect2AlAl:
-    extends: .test_template_AVX2
-    script:
+        # Seq_TestF_vect2AlAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_TestF_vect2AlAl Opts/seq__float_vectAlAl.knowledge "Opts/base_flt.exa4" Opts/seq__float.results 1 1 Platform/anyavx2.platform output
 
 ## double precision
 
-test:Seq_Test_naive:
+test:Optimization_Seq_DoublePrec_Naive:
     extends: .test_template_AVX
     script:
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_naive Opts/seq_naive.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
 
-test:Seq_Test_addrPre:
-    extends: .test_template_AVX
-    script:
-        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_addrPre Opts/seq_addrPre.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
-
-test:Seq_Test_poly:
+test:Optimization_Seq_DoublePrec_Opti:
     extends: .test_template_AVX
     tags:
         - docker
         - AVX
         - i10swarm13
     script:
+        # Seq_Test_addrPre
+        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_addrPre Opts/seq_addrPre.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
+        # Seq_Test_poly
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_poly Opts/seq_poly.knowledge "Opts/tempBlock.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
-
-test:Seq_Test_unroll:
-    extends: .test_template_AVX
-    script:
+        # Seq_Test_unroll
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_unroll Opts/seq_unroll.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
-
-test:Seq_Test_unrolli:
-    extends: .test_template_AVX
-    script:
+        # Seq_Test_unrolli
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_unrolli Opts/seq_unrolli.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
 
 ## SSE3
 
-test:Seq_Test_vectS:
+test:Optimization_Seq_DoublePrec_SSE3:
     extends: .test_template
     script:
+        # Seq_Test_vectS
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vectS Opts/seq_vect.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/random.platform output
-
-test:Seq_Test_vectSAl:
-    extends: .test_template
-    script:
+        # Seq_Test_vectSAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vectSAl Opts/seq_vectAl.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/random.platform output
-
-test:Seq_Test_vectSAlAl:
-    extends: .test_template
-    script:
+        # Seq_Test_vectSAlAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vectSAlAl Opts/seq_vectAlAl.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/random.platform output
-
-test:Seq_Test_allS:
-    extends: .test_template
-    script:
+        # Seq_Test_allS
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_allS Opts/seq_all.knowledge "Opts/tempBlock.exa4" Opts/seq.results 1 1 Platform/random.platform output
 
 # AVX
 
-test:Seq_Test_vect:
+test:Optimization_Seq_DoublePrec_AVX:
     extends: .test_template_AVX
     script:
+        # Seq_Test_vect
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vect Opts/seq_vect.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
-
-test:Seq_Test_vectAl:
-    extends: .test_template_AVX
-    script:
+        # Seq_Test_vectAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vectAl Opts/seq_vectAl.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
-
-test:Seq_Test_vectAlAl:
-    extends: .test_template_AVX
-    script:
+        # Seq_Test_vectAlAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vectAlAl Opts/seq_vectAlAl.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
-
-test:Seq_Test_all:
-    extends: .test_template_AVX
-    script:
+        # Seq_Test_all
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_all Opts/seq_all.knowledge "Opts/tempBlock.exa4" Opts/seq.results 1 1 Platform/anyavx.platform output
 
 # AVX2
 
-test:Seq_Test_vect2:
+test:Optimization_Seq_DoublePrec_AVX2:
     extends: .test_template_AVX2
     script:
+        # Seq_Test_vect2
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vect2 Opts/seq_vect.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx2.platform output
-
-test:Seq_Test_vect2Al:
-    extends: .test_template_AVX2
-    script:
+        # Seq_Test_vect2Al
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vect2Al Opts/seq_vectAl.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx2.platform output
-
-test:Seq_Test_vect2AlAl:
-    extends: .test_template_AVX2
-    script:
+        # Seq_Test_vect2AlAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_vect2AlAl Opts/seq_vectAlAl.knowledge "Opts/base.exa4" Opts/seq.results 1 1 Platform/anyavx2.platform output
-
-test:Seq_Test_all2:
-    extends: .test_template_AVX2
-    script:
+        # Seq_Test_all2
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Seq_Test_all2 Opts/seq_all.knowledge "Opts/tempBlock.exa4" Opts/seq.results 1 1 Platform/anyavx2.platform output
 
 ### parallel version (2*2*2 MPI ranks each with 8 OMP threads)
 ## single precision
 
-test:Par_TestF_naive:
+test:Optimization_Par_SinglePrec_Naive:
     extends: .test_template
     script:
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_TestF_naive Opts/par__float_naive.knowledge "Opts/base_par_flt.exa4" Opts/par__float.results 8 4 Platform/random.platform output
 
 # SSE3
-test:Par_TestF_vectS:
+test:Optimization_Par_SinglePrec_SSE3:
     extends: .test_template
     script:
+        # Par_TestF_vectS
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_TestF_vectS Opts/par__float_vect.knowledge "Opts/base_par_flt.exa4" Opts/par__float.results 8 4 Platform/random.platform output
-
-test:Par_TestF_vectSAl:
-    extends: .test_template
-    script:
+        # Par_TestF_vectSAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_TestF_vectSAl Opts/par__float_vectAl.knowledge "Opts/base_par_flt.exa4" Opts/par__float.results 8 4 Platform/random.platform output
-
-test:Par_TestF_vectSAlAl:
-    extends: .test_template
-    script:
+        # Par_TestF_vectSAlAl
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_TestF_vectSAlAl Opts/par__float_vectAlAl.knowledge "Opts/base_par_flt.exa4" Opts/par__float.results 8 4 Platform/random.platform output
 
 ## double precision
 
-test:Par_Test_naive:
+test:Optimization_Par_DoublePrec_Naive:
     extends: .test_template_AVX
     script:
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_naive Opts/par_naive.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/anyavx.platform output
 
-test:Par_Test_addrPre:
-    extends: .test_template_AVX
-    script:
-        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_addrPre Opts/par_addrPre.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/anyavx.platform output
-
-test:Par_Test_poly:
+test:Optimization_Par_DoublePrec_Opti:
     extends: .test_template_AVX
     tags:
         - docker
         - AVX
         - i10swarm13
     script:
+        # Par_Test_addrPre
+        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_addrPre Opts/par_addrPre.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/anyavx.platform output
+        # Par_Test_poly
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_poly Opts/par_poly.knowledge "Opts/tempBlock_par.exa4" Opts/par.results 8 4 Platform/anyavx.platform output
-
-test:Par_Test_unroll:
-    extends: .test_template_AVX
-    script:
+        # Par_Test_unroll
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_unroll Opts/par_unroll.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/anyavx.platform output
-
-test:Par_Test_unrolli:
-    extends: .test_template_AVX
-    script:
+        # Par_Test_unrolli
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_unrolli Opts/par_unrolli.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/anyavx.platform output
 
 # SSE3
 
-test:Par_Test_vectS:
-    extends: .test_template
-    script:
-        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_vectS Opts/par_vect.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/random.platform output
-
-test:Par_Test_vectSAl:
-    extends: .test_template
-    script:
-        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_vectSAl Opts/par_vectAl.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/random.platform output
-
-test:Par_Test_vectSAlAl:
-    extends: .test_template
-    script:
-        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_vectSAlAl Opts/par_vectAlAl.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/random.platform output
-
-test:Par_Test_allS:
+test:Optimization_Par_DoublePrec_SSE3:
     extends: .test_template
     tags:
         - docker
         - i10swarm13
     script:
+        # Par_Test_vectS
+        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_vectS Opts/par_vect.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/random.platform output
+        # Par_Test_vectSAl
+        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_vectSAl Opts/par_vectAl.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/random.platform output
+        # Par_Test_vectSAlAl
+        - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_vectSAlAl Opts/par_vectAlAl.knowledge "Opts/base_par.exa4" Opts/par.results 8 4 Platform/random.platform output
+        # Par_Test_allS
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib Par_Test_allS Opts/par_all.knowledge "Opts/tempBlock_par.exa4" Opts/par.results 8 4 Platform/random.platform output
 
 ###############################################
@@ -610,97 +456,59 @@ test:Par_Test_allS:
 ###############################################
 
 # Jacobi 2D constant coefficient 9-pt
-test:PolyExpl_Jac2Dccd_f0:
+test:PolyExpl_Jacobi_ConstCoeff_9pt_2D:
     extends: .test_template_AVX
     script:
+        # PolyExpl_Jac2Dccd_f0
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac2Dccd_f0 PolyExpl/2D_f0.knowledge "PolyExpl/Jac2Dccd.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_Jac2Dccd_f2:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_Jac2Dccd_f2
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac2Dccd_f2 PolyExpl/2D_f2.knowledge "PolyExpl/Jac2Dccd.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_Jac2Dccd_f4:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_Jac2Dccd_f4
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac2Dccd_f4 PolyExpl/2D_f4.knowledge "PolyExpl/Jac2Dccd.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_Jac2Dccd_f6:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_Jac2Dccd_f6
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac2Dccd_f6 PolyExpl/2D_f6.knowledge "PolyExpl/Jac2Dccd.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
 
 # Jacobi 3D constant coefficient 7-pt
-test:PolyExpl_Jac3Dcc_f0:
+test:PolyExpl_Jacobi_ConstCoeff_7pt_3D:
     extends: .test_template_AVX
     script:
+        # PolyExpl_Jac3Dcc_f0
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac3Dcc_f0 PolyExpl/3D_f0.knowledge "PolyExpl/Jac3Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_Jac3Dcc_f1:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_Jac3Dcc_f1
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac3Dcc_f1 PolyExpl/3D_f1.knowledge "PolyExpl/Jac3Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_Jac3Dcc_f3:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_Jac3Dcc_f3
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac3Dcc_f3 PolyExpl/3D_f3.knowledge "PolyExpl/Jac3Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_Jac3Dcc_f5:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_Jac3Dcc_f5
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac3Dcc_f5 PolyExpl/3D_f5.knowledge "PolyExpl/Jac3Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_Jac3Dcc_f6:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_Jac3Dcc_f6
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_Jac3Dcc_f6 PolyExpl/3D_f6.knowledge "PolyExpl/Jac3Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
 
 # RBGS 2D constant coefficient 5-pt
-test:PolyExpl_RBGS2Dcc_f0:
+test:PolyExpl_RBGS_ConstCoeff_5pt_2D:
     extends: .test_template_AVX
     script:
+        # PolyExpl_RBGS2Dcc_f0
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_RBGS2Dcc_f0 PolyExpl/2D_f0.knowledge "PolyExpl/RBGS2Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_RBGS2Dcc_f1:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_RBGS2Dcc_f1
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_RBGS2Dcc_f1 PolyExpl/2D_f1.knowledge "PolyExpl/RBGS2Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_RBGS2Dcc_f3:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_RBGS2Dcc_f3
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_RBGS2Dcc_f3 PolyExpl/2D_f3.knowledge "PolyExpl/RBGS2Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_RBGS2Dcc_f5:
-    extends: .test_template_AVX
-    script:
+        # PolyExpl_RBGS2Dcc_f5
         - python3 run_test.py ../Compiler/Compiler.jar:../Compiler/lib PolyExpl_RBGS2Dcc_f5 PolyExpl/2D_f5.knowledge "PolyExpl/RBGS2Dcc.exa4" PolyExpl/all.results 1 4 Platform/anyavx.platform output
-
-test:PolyExpl_RBGS2Dcc_f6:
-    extends: .test_template_AVX
-    script:
+