Changeset 2155 for proto/parabix2/pablo_template.cpp

Timestamp:

05/24/12 18:51:24 (12 months ago)

Author:

ksherdy

Message:

Reverted to 2142.

Files:

• proto/parabix2/pablo_template.cpp (modified) (5 diffs)

proto/parabix2/pablo_template.cpp

@@ -13 +13 @@
 #include "../lib/bitblock_iterator.hpp"
 #include "../lib/s2p.hpp"
-#include "../lib/perflib/perfsec.h"
+
+#define SEGMENT_BLOCKS 12
+#define BUFFER_SIZE (BLOCK_SIZE * SEGMENT_BLOCKS)
+#define OVERLAP_BUFSIZE (sizeof(BitBlock))
 
 #include "xmldecl.h"
 #include "namechars.h"
+#include "../lib/perflib/perfsec.h"
+
 #include "TagMatcher.hpp"
 #include "LineColTracker.hpp"
@@ -24 +29 @@
 
 #ifdef BUFFER_PROFILING
-    BOM_Table * parser_timer;
+        BOM_Table * parser_timer;
+
 #elif CODE_CLOCKER
-    //#define NUM_EVENTS 1
-    //int Events[NUM_EVENTS] = {PAPI_TOT_CYC};
-    //int Events[NUM_EVENTS] = {PAPI_L2_DCM};
-    #define NUM_EVENTS 2
-    int Events[NUM_EVENTS] = {PAPI_TOT_CYC, PAPI_BR_MSP};
-    int cal_size = 20;
-    CC * parser_timer = new CC(Events,NUM_EVENTS,cal_size);
+        #define NUM_EVENTS 1
+        int Events[NUM_EVENTS] = {PAPI_TOT_CYC};
+        //int Events[NUM_EVENTS] = {PAPI_L2_DCM};
+        //int Events[NUM_EVENTS] = {PAPI_TOT_CYC, PAPI_BR_MSP};
+        int cal_size = 20;
+        CC * parser_timer = new CC(Events,NUM_EVENTS,cal_size);
 #else
-    void * parser_timer;
+        void * parser_timer;
 #endif
 
+int block_base=0;
+int buffer_base=0;
+char * source;
+
+LineColTracker tracker;
+TagMatcher matcher;
 ErrorTracker error_tracker;
 BitBlock EOF_mask = simd<1>::constant<1>();
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Buffer Management
-//////////////////////////////////////////////////////////////////////////////////////////
-#include "../lib/buffer.hpp"
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// @ global depends on 'error_tracker' and 'EOF_mask' definitions.
-//////////////////////////////////////////////////////////////////////////////////////////
+static inline int NameStrt_check(int pos);
+static inline int Name_check(int pos);
+static inline int PIName_check(int pos);
+static inline int CD_check(int pos);
+static inline int GenRef_check(int pos);
+static inline int HexRef_check(int pos);
+static inline int DecRef_check(int pos);
+static inline int AttRef_check(int pos);
+
 @global
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Headers that depend @ global stream struct types.
-//////////////////////////////////////////////////////////////////////////////////////////
-#include "../lib/transpose.hpp"
-#include "post_process.hpp"
-
-static void do_process(FILE *infile, FILE *outfile);
+static inline void s2p_do_block(BytePack U8[], Basis_bits & basis_bits);
+static inline void s2p_do_final_block(BytePack U8[], Basis_bits & basis_bits, BitBlock EOF_mask);
+static inline void postprocess_do_block(Lex & lex, CtCDPI_Callouts & ctCDPI_Callouts, Ref_Callouts & ref_Callouts, Check_streams & check_streams, int chars_avail);
+
+void do_process(FILE *infile, FILE *outfile);
+
+static inline void validate_block(BitBlockForwardIterator & start, int block_base, int is_valid(int));
+static inline void validate_block(BitBlockForwardIterator & start, int block_base, int is_valid(int,int));
 
 int main(int argc, char * argv[]) {
@@ -87 +100 @@
         }
 
-        PERF_SEC_BIND(1);
+//      PERF_SEC_BIND(1);
 
         PERF_SEC_INIT(parser_timer);
@@ -103 +116 @@
 }
 
+/* s2p Definitions */
+static inline void s2p_do_block(BytePack U8[], Basis_bits & basis_bits) {
+  s2p(U8[0], U8[1], U8[2], U8[3], U8[4], U8[5], U8[6], U8[7],
+        basis_bits.bit_0, basis_bits.bit_1, basis_bits.bit_2, basis_bits.bit_3, basis_bits.bit_4, basis_bits.bit_5, basis_bits.bit_6, basis_bits.bit_7);
+}
+
+static inline void s2p_do_final_block(BytePack U8[], Basis_bits & basis_bits, BitBlock EOF_mask) {
+  s2p_do_block(U8, basis_bits);
+  basis_bits.bit_0 = simd_and(basis_bits.bit_0, EOF_mask);
+  basis_bits.bit_1 = simd_and(basis_bits.bit_1, EOF_mask);
+  basis_bits.bit_2 = simd_and(basis_bits.bit_2, EOF_mask);
+  basis_bits.bit_3 = simd_and(basis_bits.bit_3, EOF_mask);
+  basis_bits.bit_4 = simd_and(basis_bits.bit_4, EOF_mask);
+  basis_bits.bit_5 = simd_and(basis_bits.bit_5, EOF_mask);
+  basis_bits.bit_6 = simd_and(basis_bits.bit_6, EOF_mask);
+  basis_bits.bit_7 = simd_and(basis_bits.bit_7, EOF_mask);
+}
+
+
+static inline int NameStrt_check(int pos) {
+        if(XML_10_UTF8_NameStrt_bytes((unsigned char*)&source[pos]) == 0){
+              return XMLTestSuiteError::NAME_START;
+        }
+        return 0;
+}
+
+static inline int Name_check(int pos) {
+        if(XML_10_UTF8_NameChar_bytes((unsigned char*)&source[pos]) == 0){
+                  return XMLTestSuiteError::NAME;
+        }
+        return 0;
+}
+
+static inline int PIName_check(int pos, int file_pos) {
+        if (at_XxMmLll<ASCII>((unsigned char*)&source[pos]) && (source[pos+3]=='?' || source[pos+3]<= ' ')) {
+              // "<?xml" legal at start of file.
+              if (!((file_pos == 2) && at_XmlDecl_start<ASCII>((unsigned char*)&source[0]))) {
+                  return XMLTestSuiteError::XMLPINAME;
+              }
+        }
+        return 0;
+}
+
+static inline int CD_check(int pos) {
+        if (!at_CDATA1<ASCII>((unsigned char*)&source[pos])){
+                  return XMLTestSuiteError::CDATA;
+        }
+        return 0;
+}
+
+static inline int GenRef_check(int pos) {
+        unsigned char* s = (unsigned char*)&source[pos];
+        if (!(at_Ref_gt<ASCII>(s)||at_Ref_lt<ASCII>(s)||at_Ref_amp<ASCII>(s)||at_Ref_quot<ASCII>(s)||at_Ref_apos<ASCII>(s))){
+              return XMLTestSuiteError::UNDEFREF;
+        }
+        return 0;
+}
+
+static inline int HexRef_check(int pos) {
+        unsigned char* s = (unsigned char*)&source[pos];
+        int ch_val = 0;
+        while(at_HexDigit<ASCII>(s)){
+          ch_val = HexVal<ASCII>(s[0]) + (ch_val<<4);
+          if (ch_val> 0x10FFFF ){
+                return XMLTestSuiteError::CHARREF;
+          }
+          s++;
+        }
+        if ((ch_val == 0x0) || ((ch_val | 0x7FF) == 0xDFFF)|| ((ch_val | 0x1) == 0xFFFF)){
+          return XMLTestSuiteError::CHARREF;
+        }
+        else if (((ch_val < 0x20) && (ch_val != 0x9) && (ch_val != 0xD) && (ch_val != 0xA))){
+          return XMLTestSuiteError::XML10CHARREF;
+        }
+        return 0;
+}
+
+static inline int DecRef_check(int pos) {
+        unsigned char* s = (unsigned char*)&source[pos];
+        int ch_val = 0;
+        while(at_HexDigit<ASCII>(s)){
+          ch_val = DigitVal<ASCII>(s[0]) + ch_val*10;
+          if (ch_val> 0x10FFFF ){
+                        return XMLTestSuiteError::CHARREF;
+          }
+          s++;
+        }
+        if ((ch_val == 0x0) || ((ch_val | 0x7FF) == 0xDFFF)|| ((ch_val | 0x1) == 0xFFFF)){
+                  return XMLTestSuiteError::CHARREF;
+        }
+        else if (((ch_val < 0x20) && (ch_val != 0x9) && (ch_val != 0xD) && (ch_val != 0xA))){
+                  return XMLTestSuiteError::XML10CHARREF;
+        }
+        return 0;
+}
+
+static inline int AttRef_check(int pos) {
+        unsigned char* s = (unsigned char*)&source[pos];
+        int ch_val = 0;
+        if(s[0]=='#'){
+          s++;
+          if(s[0]=='x' || s[0]=='X'){
+            s++;
+            while(at_HexDigit<ASCII>(s)){
+              ch_val = HexVal<ASCII>(s[0]) + (ch_val<<4);
+              s++;
+            }
+          }
+          else{
+            while(at_HexDigit<ASCII>(s)){
+              ch_val = DigitVal<ASCII>(s[0]) + ch_val*10;
+              s++;
+            }
+          }
+          if (ch_val==60){
+            return XMLTestSuiteError::ATTREF;
+          }
+        }
+        else if(at_Ref_lt<ASCII>(s)){
+          return XMLTestSuiteError::ATTREF;
+        }
+        return 0;
+}
+
+static inline void validate_block(BitBlockForwardIterator & start, int block_base, int is_valid(int)) {
+
+        int pos, block_pos;
+        BitBlockForwardIterator end;
+        while(start != end) {
+
+                block_pos = block_base + *start;
+                int rv = is_valid(block_pos);
+
+                if (rv) {
+                        int error_line, error_column;
+                        tracker.get_Line_and_Column(block_pos, error_line, error_column);
+                        ReportError(XMLTestSuiteError::get_msg(rv), error_line, error_column);
+                        exit(-1);
+                }
+                start++;
+        }
+}
+
+static inline void validate_block(BitBlockForwardIterator & start, int block_base, int buffer_base, int is_valid(int,int)) {
+
+        int pos, block_pos, file_pos;
+        BitBlockForwardIterator end;
+        while(start != end) {
+
+                block_pos = block_base + *start;
+                file_pos = block_pos+buffer_base;
+
+
+                int rv = is_valid(block_pos, file_pos);
+
+                if (rv) {
+                        int error_line, error_column;
+                        tracker.get_Line_and_Column(block_pos, error_line, error_column);
+                        ReportError(XMLTestSuiteError::get_msg(rv), error_line, error_column);
+                        exit(-1);
+                }
+                start++;
+        }
+}
+
+static inline void postprocess_do_block(Lex & lex, CtCDPI_Callouts & ctCDPI_Callouts, Ref_Callouts & ref_Callouts, Check_streams & check_streams, int chars_avail){
+BitBlockForwardIterator iter;
+
+tracker.StoreNewlines(lex.LF);
+
+if (bitblock::any(simd_or(check_streams.non_ascii_name_starts, check_streams.non_ascii_names))) {
+        iter.init(&check_streams.non_ascii_name_starts);
+        validate_block(iter, block_base, NameStrt_check);
+        iter.init(&check_streams.non_ascii_names);
+        validate_block(iter, block_base, Name_check);
+}
+if (bitblock::any(ctCDPI_Callouts.PI_name_starts)){
+        iter.init(&(ctCDPI_Callouts.PI_name_starts));
+        validate_block(iter, block_base, buffer_base, PIName_check);
+}
+if (bitblock::any(ctCDPI_Callouts.CD_starts)){
+        iter.init(&ctCDPI_Callouts.CD_starts);
+        validate_block(iter, block_base, CD_check);
+}
+if(bitblock::any(ref_Callouts.GenRef_starts)){
+        iter.init(&ref_Callouts.GenRef_starts);
+        validate_block(iter, block_base, GenRef_check);
+}
+if(bitblock::any(ref_Callouts.DecRef_starts)){
+        iter.init(&ref_Callouts.DecRef_starts);
+        validate_block(iter, block_base, DecRef_check);
+}
+if(bitblock::any(ref_Callouts.HexRef_starts)){
+        iter.init(&ref_Callouts.HexRef_starts);
+        validate_block(iter, block_base, HexRef_check);
+}
+if(bitblock::any(check_streams.att_refs)){
+        iter.init(&check_streams.att_refs);
+        validate_block(iter, block_base, AttRef_check);
+}
+
+if(error_tracker.Has_Noted_Error()){
+        int error_line, error_column;
+        tracker.get_Line_and_Column(error_tracker.Noted_Pos_In_Block(), error_line, error_column);
+        ReportError(error_tracker.Noted_Error_Msg(), error_line, error_column);
+        exit(-1);
+}
+
+matcher.store_streams(check_streams.tag_marks, check_streams.name_follows, check_streams.misc_mask, chars_avail);
+tracker.AdvanceBlock();
+
+}
+
 void do_process(FILE *infile, FILE *outfile) {
 
-    @decl
-
-    LineColTracker tracker;
-    TagMatcher<SEGMENT_SIZE,PADDING_SIZE> matcher;
-
-    uint8_t * src_buf;
-    int block_base=0;
-    int buffer_base=0;
-    int buffer_pos = 0;
-    int block_pos = 0;
-    int chars_avail = 0;
-    int check_pos = 0;
-    int chars_read = 0;
-
-    //////////////////////////////////////////////////////////////////////////////////////////
-    // Buffer Management
-    //////////////////////////////////////////////////////////////////////////////////////////
-    //BitBlock buf[(BUFFER_SIZE)/sizeof(BitBlock)];
-    void * temp;
-    ALLOC_STATIC_ALIGNED_BYTE_BUFFER(temp);
-    src_buf = (uint8_t *)temp;
-
-    buffer_base = buffer_pos;
-    chars_read = fread((void *)src_buf, 1, SEGMENT_SIZE, infile);
-    chars_avail = chars_read;
-    if (chars_avail > SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
-
-    //////////////////////////////////////////////////////////////////////////////////////////
-    // XML Validation / Content Model
-    //////////////////////////////////////////////////////////////////////////////////////////
-    if(chars_read<4){
+@decl
+
+  int buf_pos = 0;
+  int block_pos = 0;
+  int chars_avail = 0;
+  int check_pos = 0;
+  int chars_read = 0;
+  BytePack buf[(BUFFER_SIZE+BLOCK_SIZE+OVERLAP_BUFSIZE*2)/sizeof(BitBlock)];
+
+  char * srcbuf = ((char *) buf) + OVERLAP_BUFSIZE;
+  buffer_base = buf_pos;
+  source = srcbuf;
+
+  chars_read = fread((void *)srcbuf, 1, BUFFER_SIZE + OVERLAP_BUFSIZE, infile);
+  chars_avail = chars_read;
+  if (chars_avail > BUFFER_SIZE) chars_avail = BUFFER_SIZE;
+
+  matcher.setSrc(srcbuf);
+
+  if(chars_read<4){
     fprintf(stderr,"File is too short. Not well formed.\n");
     exit(-1);
+  }
+
+  Entity_Info * e = new Entity_Info;
+  e->AnalyzeSignature((unsigned char *)srcbuf);
+
+  if (e->code_unit_base == ASCII) {
+
+    XML_Decl_Parser<ASCII> decl_parser((unsigned char *)srcbuf);
+
+    decl_parser.ReadXMLInfo(*e);
+
+    if (e->code_unit_size != SingleByte || (e->has_encoding_decl && (!at_UTF_8(e->encoding)))){
+        fprintf(stderr,"Sorry, this xmlwf demo only works for UTF-8.\n");
+        exit(-1);
     }
-
-    Entity_Info * e = new Entity_Info;
-    e->AnalyzeSignature((unsigned char *)src_buf);
-
-    if (e->code_unit_base == ASCII) {
-
-    XML_Decl_Parser<ASCII> decl_parser((unsigned char *)src_buf);
-
-    decl_parser.ReadXMLInfo(*e);
-
-    if (e->code_unit_size != SingleByte || (e->has_encoding_decl && (!at_UTF_8(e->encoding)))){
-        fprintf(stderr,"Sorry, this xmlwf demo only works for UTF-8.\n");
-        exit(-1);
-    }
-    }
-    else {
-        fprintf(stderr,"Sorry, this xmlwf demo does not process EBCDIC.\n");
-        exit(-1);
-    }
-
-    if (e->content_start != 0) {
-    memmove(&src_buf[0], &src_buf[e->content_start], chars_read - e->content_start);
-    buffer_pos = e->content_start;
-    if (chars_avail == SEGMENT_SIZE) {
-        chars_read = chars_read - e->content_start + fread(&src_buf[chars_read-e->content_start], 1, e->content_start, infile);
-        chars_avail = chars_read;
-        if (chars_avail > SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
-    }
-    else {
-      chars_read -=e->content_start;
-      chars_avail -=e->content_start;
-    }
-    }
-
-    @stream_stmts
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////
-    // Full Segments
-    //////////////////////////////////////////////////////////////////////////////////////////
-    matcher.setSrc((char *)src_buf);
-    while (chars_avail == SEGMENT_SIZE) {
+  }
+  else {
+    fprintf(stderr,"Sorry, this xmlwf demo does not process EBCDIC.\n");
+        exit(-1);
+  }
+
+  if (e->content_start != 0) {
+        memmove(&srcbuf[0], &srcbuf[e->content_start], chars_read - e->content_start);
+        buf_pos = e->content_start;
+        if (chars_avail == BUFFER_SIZE) {
+                chars_read = chars_read - e->content_start +
+                             fread(&srcbuf[chars_read-e->content_start], 1, e->content_start, infile);
+                chars_avail = chars_read;
+                if (chars_avail > BUFFER_SIZE) chars_avail = BUFFER_SIZE;
+        }
+        else {
+          chars_read -=e->content_start;
+          chars_avail -=e->content_start;
+        }
+  }
+
+@stream_stmts
+
+/* Full Buffers */
+
+    while (chars_avail == BUFFER_SIZE) {
       PERF_SEC_START(parser_timer);
       for (int blk = 0; blk < SEGMENT_BLOCKS; blk++) {
           block_base = blk*BLOCK_SIZE;
-          s2p_do_block((BytePack *) &src_buf[block_base], basis_bits);
+          s2p_do_block((BytePack *) &srcbuf[block_base], basis_bits);
           @block_stmts
-          tracker.StoreNewlines(lex.LF);
-          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, (char *)src_buf, buffer_base, block_base, chars_avail, tracker);
-          matcher.store_streams(check_streams.tag_marks, check_streams.name_follows, check_streams.misc_mask, chars_avail);
-          tracker.AdvanceBlock();
+          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, chars_avail);
       }
       matcher.StreamScan(chars_avail);
@@ -196 +406 @@
 
       int bytes_left = chars_read - chars_avail;
-      memmove(src_buf, &src_buf[SEGMENT_SIZE], bytes_left);
-      chars_read = fread(&src_buf[bytes_left], 1, SEGMENT_SIZE - bytes_left, infile) + bytes_left;
+      memmove(srcbuf, &srcbuf[BUFFER_SIZE], bytes_left);
+      chars_read = fread(&srcbuf[bytes_left],1, BUFFER_SIZE + OVERLAP_BUFSIZE - bytes_left, infile) + bytes_left;
       chars_avail = chars_read;
-      if (chars_avail > SEGMENT_SIZE) chars_avail = SEGMENT_SIZE;
-      buffer_pos += chars_avail;
-      buffer_base = buffer_pos;
+      if (chars_avail > BUFFER_SIZE) chars_avail = BUFFER_SIZE;
+      buf_pos += chars_avail;
+      buffer_base = buf_pos;
     }
-
-    //////////////////////////////////////////////////////////////////////////////////////////
-    // Final Partial Segment
-    //////////////////////////////////////////////////////////////////////////////////////////
+/* Final Partial Buffer */
     PERF_SEC_START(parser_timer);
 
     block_pos = 0;
     int remaining = chars_avail;
-
-    /* Full Blocks */
+/* Full Blocks */
     while (remaining >= BLOCK_SIZE) {
-          block_base = block_pos;
-          s2p_do_block((BytePack *) &src_buf[block_pos], basis_bits);
+          block_base = block_pos;
+          s2p_do_block((BytePack *) &srcbuf[block_pos], basis_bits);
           @block_stmts
-          tracker.StoreNewlines(lex.LF);
-          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, (char *)src_buf, buffer_base, block_base, chars_avail, tracker);
-          matcher.store_streams(check_streams.tag_marks, check_streams.name_follows, check_streams.misc_mask, chars_avail);
-          tracker.AdvanceBlock();
-          block_pos += BLOCK_SIZE;
+          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, chars_avail);
+          block_pos += BLOCK_SIZE;
           remaining -= BLOCK_SIZE;
     }
     block_base = block_pos;
-
-    /* Partial Block or Any Carry */
     if (remaining > 0 || @any_carry) {
           EOF_mask = bitblock::srl(simd<1>::constant<1>(), convert(BLOCK_SIZE-remaining));
-          s2p_do_final_block((BytePack *) &src_buf[block_pos], basis_bits, EOF_mask);
+          s2p_do_final_block((BytePack *) &srcbuf[block_pos], basis_bits, EOF_mask);
           @final_block_stmts
-          tracker.StoreNewlines(lex.LF);
-          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, (char *)src_buf, buffer_base, block_base, chars_avail, tracker);
-          matcher.store_streams(check_streams.tag_marks, check_streams.name_follows, check_streams.misc_mask, chars_avail);
-          tracker.AdvanceBlock();
-
+          postprocess_do_block(lex, ctCDPI_Callouts, ref_Callouts, check_streams, chars_avail);
     }
-
-    buffer_pos += chars_avail;
-    buffer_base = buffer_pos;
+    buf_pos += chars_avail;
+    buffer_base = buf_pos;
 
     matcher.StreamScan(chars_avail);
     matcher.Advance_buffer();
+
 
     PERF_SEC_END(parser_timer, chars_avail);