Changeset 152


Ignore:
Timestamp:
May 22, 2008, 2:54:37 PM (11 years ago)
Author:
lindanl
Message:

Makefile variables for 64-bit mode; performance definitions.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r143 r152  
    77endif
    88PAPI=-DPAPI -I/usr/local/papi-3.5.0-linux-x86/include -L/usr/local/papi-3.5.0-linux-x86/lib -lpapi
     9PAPI64=-DPAPI -I/usr/local/papi-3.5.0-linux-x86/include -L/usr/local/papi-3.5.0-linux-x86/lib -lpapi
    910
    1011markup_stats:   markup_stats.cxx src/byteplex.h src/multiliteral.h src/engine.h\
     
    1920                lib/lib_simd.h lib/sse_simd.h src/xmldecl.h src/xmldecl.c\
    2021                src/bytelex.h src/charsets/ASCII_EBCDIC.h
    21         $(CC) -o markup_stats_64 markup_stats.cxx -march=nocona -m64 $(PAPI)
     22        $(CC) -o markup_stats_64 markup_stats.cxx -march=nocona -m64 $(PAPI64)
    2223
    2324markup_stats_omp:       markup_stats.cxx src/byteplex.h src/multiliteral.h src/engine.h\
  • trunk/PerfTest/expat_markup_stats/Makefile

    r148 r152  
    1212INCLUDES=-I/usr/local/papi-3.5.0-linux-x86/include -I/opt/expat_2_0_1/include
    1313LINKS=-lpapi -lexpat
    14 LIBS=-L/usr/local/papi-3.5.0-linux-x86/lib64 -L/opt/expat_2_0_1/lib
     14LIBS=-L/usr/local/papi-3.5.0-linux-x86/lib -L/opt/expat_2_0_1/lib
     15LIBS64=-L/usr/local/papi-3.5.0-linux-x86/lib64 -L/opt/expat_2_0_1/lib
    1516
    1617expat_markup_stats_32: expat_markup_stats.c
     
    1819
    1920expat_markup_stats_64: expat_markup_stats.c
    20         $(CC) $(CFLAGS) -o expat_markup_stats expat_markup_stats.c -march=nocona -m64 $(INCLUDES) $(LINKS) $(LIBS) -DPAPI -DCALC_AVG
     21        $(CC) $(CFLAGS) -o expat_markup_stats expat_markup_stats.c -march=nocona -m64 $(INCLUDES) $(LINKS) $(LIBS64) -DPAPI -DCALC_AVG
    2122       
    2223clean:
  • trunk/PerfTest/xerces_markup_stats/Makefile

    r149 r152  
    99INCLUDES=-I/usr/local/papi-3.5.0-linux-x86/include -I/opt/xerces-c_2_8_0-x86-linux-gcc_3_4/include
    1010LINKS=-lpapi -lxerces-c
    11 LIBS=-L/usr/local/papi-3.5.0-linux-x86/lib64 -L/opt/xerces-c_2_8_0-x86-linux-gcc_3_4/lib
     11LIBS=-L/usr/local/papi-3.5.0-linux-x86/lib -L/opt/xerces-c_2_8_0-x86-linux-gcc_3_4/lib
     12LIBS64=-L/usr/local/papi-3.5.0-linux-x86/lib64 -L/opt/xerces-c_2_8_0-x86-linux-gcc_3_4/lib
    1213
    1314xerces_markup_stats_32: xerces_markup_stats.hpp xerces_markup_stats.cpp markup_stats_handlers.hpp markup_stats_handlers.cpp
     
    1516
    1617xerces_markup_stats_64: xerces_markup_stats.hpp xerces_markup_stats.cpp markup_stats_handlers.hpp markup_stats_handlers.cpp
    17         $(CC) -o xerces_markup_stats xerces_markup_stats.cpp markup_stats_handlers.cpp -march=nocona -m64 $(INCLUDES) $(LINKS) $(LIBS) -DPAPI -DDEBUG -DCALC_AVG
     18        $(CC) -o xerces_markup_stats xerces_markup_stats.cpp markup_stats_handlers.cpp -march=nocona -m64 $(INCLUDES) $(LINKS) $(LIBS64) -DPAPI -DDEBUG -DCALC_AVG
    1819       
    1920clean:
  • trunk/markup_stats.cxx

    r143 r152  
    1717using namespace std;
    1818
     19#define ON 1
     20#define OFF 2
     21
     22#define VALIDATION_MODE OFF
     23
    1924#ifdef PAPI
    2025#include "../code_clocker/clocker/cc.h"
     
    2227
    2328CC * code_clocker;
     29
     30#define NONE 0
     31#define END_TAG_MATCHING 1
     32#define ATTRIBUTE_UNIQUENESS 2
     33#define NAME_VALIDATION 3
     34#define NAME_LOOKUP 4
     35
     36#define OMISSION NAME_LOOKUP
     37
    2438
    2539#define CHARSET_VALIDATION 1
     
    3145#define ADVANCE_BUFFERS 7
    3246#define BUFFER_TOTAL 8
     47#define FILE_READING 9
    3348
    3449#define CODE_CLOCKING BUFFER_TOTAL
     
    417432
    418433        #ifdef PAPI
     434       
     435        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == CHARSET_VALIDATION)
     436                code_clocker->cc_set_param("CODE_CLOCKING", "CHARSET_VALIDATION");
     437        #endif 
     438        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == WS_CONTROL)
     439                code_clocker->cc_set_param("CODE_CLOCKING", "WS_CONTROL");
     440        #endif
     441        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == MARKUP_STREAMS)
     442                code_clocker->cc_set_param("CODE_CLOCKING", "MARKUP_STREAMS");
     443        #endif
     444        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == BITLEX_ALL)
     445                code_clocker->cc_set_param("CODE_CLOCKING", "BITLEX_ALL");
     446        #endif
     447        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == BITPLEX)
     448                code_clocker->cc_set_param("CODE_CLOCKING", "BITPLEX");
     449        #endif
     450        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == BYTEPLEX)
     451                code_clocker->cc_set_param("CODE_CLOCKING", "BYTEPLEX");
     452        #endif
     453        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == ADVANCE_BUFFERS)
     454                code_clocker->cc_set_param("CODE_CLOCKING", "ADVANCE_BUFFERS");
     455        #endif
     456        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == BUFFER_TOTAL)
     457                code_clocker->cc_set_param("CODE_CLOCKING", "BUFFER_TOTAL");
     458        #endif
     459        #if defined(CODE_CLOCKING) and (CODE_CLOCKING == FILE_READING)
     460                code_clocker->cc_set_param("CODE_CLOCKING", "FILE_READING");
     461        #endif
     462        #if defined(OMISSION) and (OMISSION == NONE)
     463                code_clocker->cc_set_param("OMISSION", "NONE");
     464        #endif
     465        #if defined(OMISSION) and (OMISSION == END_TAG_MATCHING)
     466                code_clocker->cc_set_param("OMISSION", "END_TAG_MATCHING");
     467        #endif
     468        #if defined(OMISSION) and (OMISSION == ATTRIBUTE_UNIQUENESS)
     469                code_clocker->cc_set_param("OMISSION", "ATTRIBUTE_UNIQUENESS");
     470        #endif
     471        #if defined(OMISSION) and (OMISSION == NAME_VALIDATION)
     472                code_clocker->cc_set_param("OMISSION", "NAME_VALIDATION");
     473        #endif
     474        #if defined(OMISSION) and (OMISSION == NAME_LOOKUP)
     475                code_clocker->cc_set_param("OMISSION", "NAME_LOOKUP");
     476        #endif
     477        #if defined(VALIDATION_MODE) and (VALIDATION_MODE == ON)
     478                code_clocker->cc_set_param("VALIDATION_MODE", "ON");
     479        #endif
     480        #if defined(VALIDATION_MODE) and (VALIDATION_MODE == OFF)
     481                code_clocker->cc_set_param("VALIDATION_MODE", "OFF");
     482        #endif
     483       
    419484                code_clocker->cc_write_xml_file();
    420485                code_clocker->cc_display();
Note: See TracChangeset for help on using the changeset viewer.