[Rose-commits] r292 - in branches/rice:
src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser
src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java
src/frontend/OpenFortranParser_SAGE_Connection
tests/CompileTests/CAF_tests
laksono at osp5.lbl.gov
laksono at osp5.lbl.gov
Mon Mar 9 08:43:39 PDT 2009
Author: laksono
Date: 2009-03-09 08:43:39 -0700 (Mon, 09 Mar 2009)
New Revision: 292
Modified:
branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranLexer.g
branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranParser.g
branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/FortranParserActionPrint.java
branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/IFortranParserAction.java
branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserAction.h
branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C
branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/c_actions_jni.c
branches/rice/tests/CompileTests/CAF_tests/Makefile.am
branches/rice/tests/CompileTests/CAF_tests/caf-team.f90
Log:
Revert to the revision 299 since we don't need to accept "sync team" statement in the parser (instead, we will use libraries)
Modified: branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranLexer.g
===================================================================
--- branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranLexer.g 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranLexer.g 2009-03-09 15:43:39 UTC (rev 292)
@@ -453,6 +453,7 @@
T_RBRACKET : ']' ;
T_RPAREN : ')' ;
T_UNDERSCORE : '_' ;
+
// Laks 2009.01.13: add token at for team
T_AT : '@' ;
@@ -602,11 +603,10 @@
T_WRITE : 'WRITE' ;
// Laks 2009.01.20: add "with team construct"
-T_IMAGETEAM : 'IMAGE_TEAM';
-T_SYNC : 'SYNC';
-T_TEAM : 'TEAM';
-T_WITHTEAM : 'WITHTEAM';
-T_WITH : 'WITH';
+T_WITHTEAM : 'WITHTEAM';
+T_WITH : 'WITH';
+T_TEAM : 'TEAM';
+T_IMAGETEAM : 'IMAGE_TEAM';
T_ENDASSOCIATE : 'ENDASSOCIATE' ;
T_ENDBLOCK : 'ENDBLOCK' ;
Modified: branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranParser.g
===================================================================
--- branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranParser.g 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/FortranParser.g 2009-03-09 15:43:39 UTC (rev 292)
@@ -365,7 +365,6 @@
// to define tokens w/o defining them in the lexer so that the lexer doesn't
// have to add them to it's parsing.. 02.05.07
// Laks 2009.01.20: add action for with team construct
-// Laks 2009.03.04: add action for sync team <team>
: allocate_stmt
| assignment_stmt
| backspace_stmt
@@ -388,7 +387,6 @@
| read_stmt
| return_stmt
| rewind_stmt
- | rice_sync_team_stmt
| stop_stmt
| wait_stmt
| where_stmt
@@ -5098,12 +5096,6 @@
// ---------------------------
// All Rice's rules and actions will prefixed with "rice_" keyword
//----------------------------------------------------------------------------
-rice_sync_team_stmt
- at init{Token lbl = null; }
- :
- (label {lbl=$label.tk;})? T_SYNC T_TEAM T_IDENT end_of_stmt
- { action.rice_sync_team(lbl, $T_IDENT); }
- ;
// Laks 2009.01.13: add declaration of rice caf
rice_co_shape_spec:
Modified: branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/FortranParserActionPrint.java
===================================================================
--- branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/FortranParserActionPrint.java 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/FortranParserActionPrint.java 2009-03-09 15:43:39 UTC (rev 292)
@@ -17,6 +17,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*****************************************************************************/
+
package fortran.ofp.parser.java;
import org.antlr.runtime.Token;
@@ -5021,15 +5022,6 @@
//------------------------------------------------------------
// Rice Methods Implementation
//------------------------------------------------------------
- /**
- * collective synchronous within a team
- */
- public void rice_sync_team(Token label, Token idTeam) {
- printRuleHeader(3000, "rice_sync_team");
- if (idTeam!=null) printParameter(idTeam, "id");
- printRuleTrailer();
- }
-
/**
* Laks 2009.01.14: add rice action for co-array fortran
*/
Modified: branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/IFortranParserAction.java
===================================================================
--- branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/IFortranParserAction.java 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/src/3rdPartyLibraries/fortran-parser/src/fortran/ofp/parser/java/IFortranParserAction.java 2009-03-09 15:43:39 UTC (rev 292)
@@ -4394,11 +4394,6 @@
//------------------------------------------------------------
/**
- * collective synchronous within a team
- */
- public abstract void rice_sync_team(Token label, Token idTeam);
-
- /**
* rice_co_shape_spec:
* int_constant
* | int_constant T_AT T_IDENT{ action.rice_co_shape_spec($T_IDENT); }
Modified: branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserAction.h
===================================================================
--- branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserAction.h 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserAction.h 2009-03-09 15:43:39 UTC (rev 292)
@@ -983,9 +983,8 @@
//--------------------------------------------------------------
// RICE prototype
//--------------------------------------------------------------
+// Laks: add rice actions here
-void c_action_rice_sync_team( Token_t *label, Token_t *carg_0 );
-
void c_action_rice_image_selector(Token_t *carg_0);
void c_action_rice_allocate_co_array_spec(Token_t *team_id) ;
Modified: branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C
===================================================================
--- branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C 2009-03-09 15:43:39 UTC (rev 292)
@@ -16951,6 +16951,10 @@
}
#endif
+//------------------------------------------------------------------------
+// RICE IMPLEMENTATION
+//------------------------------------------------------------------------
+
// Laks 2009.01.13
// FMZ (2/6/2009): Added function body
void c_action_co_array_spec()
@@ -16975,22 +16979,7 @@
}
-// ------------------------------------------------------------------
-// RICE CAF IMPLEMENTATION
-// ------------------------------------------------------------------
-/**
- * Laksono 2009.03.04: add CAF sync team
- */
-void c_action_rice_sync_team( Token_t *label, Token_t *team_id )
-{
- if ( SgProject::get_verbose() > DEBUG_RULE_COMMENT_LEVEL )
- printf ("In c_action_rice_sync_team() \n");
- if (team_id) {
- printf("sync team: %s\n", team_id->text);
- }
-}
-
// Laks 2009.01.14
// FMZ (2/6/2009): currently seems we only need to print out the debug info.
void c_action_rice_co_shape_spec(const char *arg)
Modified: branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/c_actions_jni.c
===================================================================
--- branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/c_actions_jni.c 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/src/frontend/OpenFortranParser_SAGE_Connection/c_actions_jni.c 2009-03-09 15:43:39 UTC (rev 292)
@@ -8957,33 +8957,8 @@
//------------------------------------------------------------
-/***
- *
- */
-void Java_fortran_ofp_parser_c_jni_FortranParserActionJNI_rice_1sync_1team(JNIEnv *env, jobject this, jobject jarg_0, jobject jarg_1)
-{
- Token_t *carg_0 = NULL;
- Token_t *carg_1 = NULL;
-
-#ifdef DEBUG
- printf("hello from %s\n", "rice_sync_team");
-#endif
-
- if(jarg_0 != NULL)
- carg_0 = convert_Java_token(env, jarg_0);
- if(jarg_1 != NULL)
- carg_1 = convert_Java_token(env, jarg_1);
-
- c_action_rice_sync_team(carg_0, carg_1);
-
- if(carg_0 != NULL)
- register_token(carg_0);
- if(carg_1 != NULL)
- register_token(carg_1);
-}
-
/**
- *
+ * Rice CAF image selector
*/
void Java_fortran_ofp_parser_c_jni_FortranParserActionJNI_rice_1image_1selector(JNIEnv *env, jobject this, jobject jarg_0)
{
Modified: branches/rice/tests/CompileTests/CAF_tests/Makefile.am
===================================================================
--- branches/rice/tests/CompileTests/CAF_tests/Makefile.am 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/tests/CompileTests/CAF_tests/Makefile.am 2009-03-09 15:43:39 UTC (rev 292)
@@ -5,12 +5,12 @@
#####################################################################################
# affinity &arr[i] is parsed to arr+i, may hurt the later translation
+# Laks: add the test files here
TESTCODES_REQUIRED_TO_PASS = \
caf-decl.f90 \
caf-allocate.f90 \
caf-team.f90 \
- caf.f90 \
- caf-sub.f90
+ caf.f90
TESTCODE_CURRENTLY_FAILING =
Modified: branches/rice/tests/CompileTests/CAF_tests/caf-team.f90
===================================================================
--- branches/rice/tests/CompileTests/CAF_tests/caf-team.f90 2009-03-04 21:05:48 UTC (rev 291)
+++ branches/rice/tests/CompileTests/CAF_tests/caf-team.f90 2009-03-09 15:43:39 UTC (rev 292)
@@ -6,13 +6,9 @@
titi = toto
with team team2
-
allocate(titi(100)[@team1])
-
end with team
- sync team team2
-
titi = toto
end program caf
More information about the Rose-commits
mailing list