Changeset 6ca0dab


Ignore:
Timestamp:
Oct 7, 2020, 3:02:47 PM (13 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
5584342
Parents:
9e18677
Message:

Fixed bug in benchmarks due to new 'Compiled' pragma

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r9e18677 r6ca0dab  
    146146
    147147cleancsv:
    148         rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
     148        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
    149149
    150150jenkins$(EXEEXT): cleancsv
     
    157157        +make mutex.csv
    158158        -+make mutex.diff.csv
    159         +make scheduling.csv
    160         -+make scheduling.diff.csv
     159        +make schedint.csv
     160        -+make schedint.diff.csv
    161161@DOifskipcompile@
    162162        cat compile.csv
     
    167167        cat mutex.csv
    168168        -cat mutex.diff.csv
    169         cat scheduling.csv
    170         -cat scheduling.diff.csv
     169        cat schedint.csv
     170        -cat schedint.diff.csv
    171171
    172172compile.csv:
     
    198198        $(srcdir)/fixcsv.sh $@
    199199
    200 scheduling.csv:
     200schedint.csv:
    201201        echo "building $@"
    202202        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
     
    490490
    491491compile-array$(EXEEXT):
    492         $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     492        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/array.cfa
    493493
    494494compile-attributes$(EXEEXT):
    495         $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     495        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/attributes.cfa
    496496
    497497compile-empty$(EXEEXT):
    498         $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     498        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(srcdir)/compile/empty.cfa
    499499
    500500compile-expression$(EXEEXT):
    501         $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     501        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/expression.cfa
    502502
    503503compile-io$(EXEEXT):
    504         $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     504        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/io1.cfa
    505505
    506506compile-monitor$(EXEEXT):
    507         $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     507        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    508508
    509509compile-operators$(EXEEXT):
    510         $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     510        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/operators.cfa
    511511
    512512compile-thread$(EXEEXT):
    513         $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     513        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    514514
    515515compile-typeof$(EXEEXT):
    516         $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     516        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/typeof.cfa
    517517
    518518## =========================================================================================================
  • tests/array.cfa

    r9e18677 r6ca0dab  
    1 //                               -*- Mode: C -*- 
    2 // 
     1//                               -*- Mode: C -*-
     2//
    33// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    44//
    55// The contents of this file are covered under the licence agreement in the
    66// file "LICENCE" distributed with Cforall.
    7 // 
     7//
    88// array.cfa -- test array declarations
    9 // 
     9//
    1010// Author           : Peter A. Buhr
    1111// Created On       : Tue Feb 19 21:18:06 2019
     
    1313// Last Modified On : Sun Sep 27 09:05:40 2020
    1414// Update Count     : 4
    15 // 
     15//
    1616
    1717int a1[0];
     
    5050
    5151int main() {
    52         #pragma message( "Compiled" )                                           // force non-empty .expect file
     52        #if !defined(NO_COMPILED_PRAGMA)
     53                #pragma message( "Compiled" )   // force non-empty .expect file
     54        #endif
    5355}
    5456
  • tests/expression.cfa

    r9e18677 r6ca0dab  
    8484        (S)@{2}`mary;
    8585
    86         #pragma message( "Compiled" )                   // force non-empty .expect file
     86        #if !defined(NO_COMPILED_PRAGMA)
     87                #pragma message( "Compiled" )   // force non-empty .expect file
     88        #endif
    8789} // main
Note: See TracChangeset for help on using the changeset viewer.