Changeset 1648 for proto/SymbolTable/src


Ignore:
Timestamp:
Nov 2, 2011, 8:16:21 PM (8 years ago)
Author:
vla24
Message:

SymbolTable?: Integrated symbol table with the new IDISA architecture

Location:
proto/SymbolTable/src
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • proto/SymbolTable/src/Makefile

    r1426 r1648  
    1 SRCFILE=xmlwf.cpp
     1SRCFILE=xmlwf.cpp $(SYMTAB_LIB)/bitstream_hash_table.cpp $(SYMTAB_LIB)/hash_symbol_table.cpp $(SYMTAB_LIB)/ls_symbol_table.cxx $(SYMTAB_LIB)/symtab.cxx
    22OUTFILE=xmlwf
    33TEST= run_all.py
     
    66CFLAGS= $(SSE) -O3 #-g
    77SSE=-msse2 #-msse4.1 -DUSE_PTEST #-mssse3 -msse4.1 -msse4.2
    8 INCLUDES = -I../lib/symtab/ -I../../parabix2/src
    9 INCLUDES_IDISA = -I../lib/symtab/ -I../../../trunk/libgen/idisa_lib -I../../parabix2/src
    10 LFLAGS=-L../lib/symtab/
    11 LIBS=-lsymtab
    12 
     8SYMTAB_LIB=../symtab
     9INCLUDES = -I$(SYMTAB_LIB) -I../lib/ -I../../parabix2/src
    1310PAPI_DIR=/usr/local/papi
    1411
     
    2825        g++ -O1 -o $(OUTFILE) $(SRCFILE) -march=nocona -m64 -msse2 -DBUFFER_PROFILING  -DPERF_SCRIPT
    2926
    30 all:    depend $(SRCFILE)
    31         $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -static $(LFLAGS) $(LIBS)
     27all:
     28        $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS)
    3229
    3330avx:    $(SRCFILE)
     
    3835
    3936code_clocker:   $(SRCFILE)
    40         $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) $(CODE_CLOCKER) -static $(LFLAGS) $(LIBS)
     37        $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) $(CODE_CLOCKER)
    4138
    42 buffer_profiling: depend $(SRCFILE)
    43         $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING -static $(LFLAGS) $(LIBS)
     39buffer_profiling: $(SRCFILE)
     40        $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING
    4441
    45 buffer_profiling_perf: depend $(SRCFILE)
    46         $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT -static $(LFLAGS) $(LIBS)
    47 
    48 buffer_profiling_perf_idisa: depend_idisa $(SRCFILE)
    49         python make_idisa.py
    50         $(CC) $(INCLUDES_IDISA) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT -static $(LFLAGS) $(LIBS) -DUSE_IDISA
     42buffer_profiling_perf: $(SRCFILE)
     43        $(CC) $(INCLUDES) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -DBUFFER_PROFILING  -DPERF_SCRIPT
    5144
    5245asm:  $(SRCFILE)
     
    6255        python $(TEST)
    6356
    64 idisa:  depend_idisa $(SRCFILE)
    65         python make_idisa.py
    66         $(CC) $(INCLUDES_IDISA) -o $(OUTFILE) $(SRCFILE) $(AFLAGS) -static $(LFLAGS) $(LIBS) -DUSE_IDISA
    67 
    6857clean:
    6958        rm -f $(OUTFILE) $(OUTFILE).s $(OUTFILE).o
    7059
    71 depend_idisa:
    72         cd ../lib/symtab/ && make lib_idisa
    73 
    74 depend:
    75 # This is a hack. I wanted to use makedepend but makefile complains that it doesn't recognize makedepend
    76         cd ../lib/symtab/ && make lib
    77         #makedepend $(LIBDIR) $^
    78 
    79 # DO NOT DELETE THIS LINE -- make depend needs it
    80 
Note: See TracChangeset for help on using the changeset viewer.