Changeset 2171 for proto


Ignore:
Timestamp:
May 28, 2012, 1:44:44 PM (7 years ago)
Author:
ksherdy
Message:

Refactor src structure. Moved utility classes out to a separate dir.

Location:
proto/parabix2
Files:
4 added
16 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/pablo_template.cpp

    r2170 r2171  
    1515#include "../lib/perflib/perfsec.h"
    1616
    17 #include "xmldecl.h"
    18 #include "namechars.h"
    19 #include "TagMatcher.hpp"
    20 #include "LineColTracker.hpp"
    21 #include "ErrorUtil.h"
    22 #include "ErrorTracker.h"
    23 #include "XMLTestSuiteError.h"
     17#include <xmldecl.h>
     18#include <namechars.h>
     19#include <TagMatcher.hpp>
     20#include <LineColTracker.hpp>
     21#include <ErrorUtil.h>
     22#include <ErrorTracker.h>
     23#include <XMLTestSuiteError.h>
    2424
    2525#ifdef BUFFER_PROFILING
     
    6464//////////////////////////////////////////////////////////////////////////////////////////
    6565#include "../lib/transpose.hpp"
    66 #include "post_process.hpp"
     66#include <post_process.hpp>
    6767
    6868static void do_process(FILE *infile, FILE *outfile);
     
    177177                if (chars_avail >= SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
    178178    }
    179 
    180         //cout << chars_read << endl;
    181         //cout << chars_avail << endl;
    182         //exit(-1);
    183179
    184180    @stream_stmts
  • proto/parabix2/src/Makefile

    r2163 r2171  
    77CFLAGS= $(SSE) -O3
    88SSE=-msse2 #-msse4.1 -DUSE_PTEST #-mssse3 -msse4.1 -msse4.2
     9INCLUDES=../util
    910
    1011PAPI_DIR=/usr/local/papi
     
    2021
    2122all:    $(SRCFILE)
    22         $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS)
     23        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS)
    2324
    2425avx:    $(SRCFILE)
    25         $(CC) -o $(OUTFILE) $(SRCFILE) -march=nocona -m64 -mavx
     26        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) -march=nocona -m64 -mavx
    2627
    2728threads:        $(SRCFILE)
    28         g++ -O3 -msse2 -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -lpthread -DBUFFER_PROFILING
     29        g++ -O3 -msse2 -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -lpthread -DBUFFER_PROFILING
    2930
    3031papi_profiling: $(SRCFILE)
    31         $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) $(CODE_CLOCKER)
     32        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) $(CODE_CLOCKER)
    3233
    3334buffer_profiling: $(SRCFILE)
    34         $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING
     35        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING
    3536
    3637buffer_profiling_perf: $(SRCFILE)
    37         $(CC) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
     38        $(CC) -o $(OUTFILE) $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
    3839
    3940asm:  $(SRCFILE)
    40         $(CC) -o $(OUTFILE).s $(SRCFILE) $(AFLAGS) -S -fverbose-asm
     41        $(CC) -o $(OUTFILE).s $(SRCFILE) -I$(INCLUDES) $(AFLAGS) -S -fverbose-asm
    4142       
    4243as: $(OUTFILE).s
Note: See TracChangeset for help on using the changeset viewer.