Changeset 3022

Timestamp:

Apr 15, 2013, 6:09:16 AM (6 years ago)

Author:

bhull

Message:

RE changes

Location:

proto/RE

Files:

• doc/README (modified) (1 diff)
• output/pablo_template.cpp (modified) (12 diffs)
• output/src/Makefile (modified) (1 diff)

proto/RE/doc/README

@@ -1 @@
-Author: Ken Herdy
-Created on: June 26, 2012
+Author: Ben Hull
+Created on: April 13, 2013
 
 ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- 
-How to Set up for AnTLR3 Python Development
+RE Instructions
 ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- 
 
-1. Install Python Runtime
+1. Modify the input regular expression (RE/input/test/test1.re).
+   RE/input/grammar/re.scatter has the current grammar.
 
-cd antlr
-tar -xvf antlr_python_runtime-3.1.3.tar.gz 
-cd antlr_python_runtime-3.1.3/
-sudo python setup.py install
+2. Make in RE.
 
------ ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- 
-Additional Steps to fix for setuptools*.egg AnTLR Python runtime issue
------ ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- 
+3. Make in RE/output.
 
-Download error message 'setuptools*.egg' from http://pypi.python.org/simple/setuptools/.
-Copy to antlr_python_runtime-3.1.3 directory.
-Rename 'setuptools*.egg' to error message name.
-Rerun sudo python setup.py install.
-
-2. Copy Python RE2PBS Library Files to Bin
-
-cp res/*.py bin
-
-3. Build RE2PBS 
-
-make help
-make clean
-make pablo 
-make proto
-
-
+4. Make in RE/output/src.

proto/RE/output/pablo_template.cpp

@@ -187 +187 @@
 
           @block_stmts
-
+//print_register2("Matches",output.matches,128);
 
 match_scanner.init(&output.matches);
@@ -194 +194 @@
 line_scanner.scan_to_next();
 while(!(match_scanner.is_done() || line_scanner.is_done())) {
-        if (line_scanner.get_pos()<match_scanner.get_pos()) {
+        if (line_scanner.get_pos()<match_scanner.get_pos()-1) {
                 line_match_found=false;
                 line_scanner.scan_to_next();
@@ -200 +200 @@
                 if (!line_match_found) {
                         match_count++;
+                        //printf("Match7 at: %d\n",match_scanner.get_pos());
                         line_match_found=true;
                 }
@@ -211 +212 @@
         if (!line_match_found) {
                 match_count++;
+                        //printf("Match8 at: %d\n",match_scanner.get_pos());
                 line_match_found=true;
         }
 
 }
-while(!match_scanner.is_done()) {
-        match_count++;
-        match_scanner.scan_to_next();
-}
+
 //print_register2("Matches",output.matches, 128);
       }
@@ -245 +244 @@
                                 s2p_do_block((BytePack *) &src_buffer[block_pos], basis_bits);
                                 @block_stmts
+//print_register2("Matches",output.matches,128);
 match_scanner.init(&output.matches);
 line_scanner.init(&lex.LF);
@@ -250 +250 @@
 line_scanner.scan_to_next();
 while(!(match_scanner.is_done() || line_scanner.is_done())) {
-        if (line_scanner.get_pos()<match_scanner.get_pos()) {
+        if (line_scanner.get_pos()<match_scanner.get_pos()-1) {
                 line_match_found=false;
                 line_scanner.scan_to_next();
@@ -256 +256 @@
                 if (!line_match_found) {
                         match_count++;
+                        //printf("Match3 at: %d\n",match_scanner.get_pos());
                         line_match_found=true;
                 }
@@ -267 +268 @@
         if (!line_match_found) {
                 match_count++;
+                        //printf("Match5 at: %d\n",match_scanner.get_pos());
                 line_match_found=true;
         }
@@ -290 +292 @@
                                 s2p_do_final_block((BytePack *) &src_buffer[block_pos], basis_bits, EOF_mask);
           @final_block_stmts
-
+//print_register2("Matches",output.matches,128);
 match_scanner.init(&output.matches);
 line_scanner.init(&lex.LF);
@@ -296 +298 @@
 line_scanner.scan_to_next();
 while(!(match_scanner.is_done() || line_scanner.is_done())) {
-        if (line_scanner.get_pos()<match_scanner.get_pos()) {
+        if (line_scanner.get_pos()<match_scanner.get_pos()-1) {
                 line_match_found=false;
                 line_scanner.scan_to_next();
@@ -302 +304 @@
                 if (!line_match_found) {
                         match_count++;
+                        //printf("Match at: %d\n",match_scanner.get_pos());
                         line_match_found=true;
                 }
@@ -313 +316 @@
         if (!line_match_found) {
                 match_count++;
+                        //printf("Match2 at: %d\n",match_scanner.get_pos());
                 line_match_found=true;
         }

proto/RE/output/src/Makefile

@@ -20 +20 @@
 
 
-avx:    $(SRCFILE)
-        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) -march=nocona -m64 -mavx 
 
 all:    $(SRCFILE)
         $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) $(AFLAGS) 
+
+avx:    $(SRCFILE)
+        $(CC) -o $(OUTFILE) $(SRCFILE) $(INCLUDES) -march=nocona -m64 -mavx 
 
 papi_profiling: $(SRCFILE)