* [Patch][Cilkplus] Change C++ testsuite extensions from CPP to CC
@ 2011-09-21 19:22 Iyer, Balaji V
2011-09-23 17:45 ` H.J. Lu
0 siblings, 1 reply; 2+ messages in thread
From: Iyer, Balaji V @ 2011-09-21 19:22 UTC (permalink / raw)
To: gcc-patches
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
Hello Everyone,
This patch is for the Cilkplus branch.This patch will change the cilk-plus testsuite file extensions from ".cpp" to ".cc". In addition, some of the long filenames are shortened. The script file is also modified to reflect this change.
Thanks,
Balaji V. Iyer.
[-- Attachment #2: patch_to_fix_testsuite_extensions.txt --]
[-- Type: text/plain, Size: 80013 bytes --]
diff --git a/gcc/testsuite/ChangeLog.cilk b/gcc/testsuite/ChangeLog.cilk
index 28884f5..3796a85 100644
--- a/gcc/testsuite/ChangeLog.cilk
+++ b/gcc/testsuite/ChangeLog.cilk
@@ -1,3 +1,39 @@
+2011-09-21 Balaji V. Iyer <balaji.v.iyer@intel.com>
+
+ * g++.dg/cilk-plus/Clock.cpp: Changed extension from .cpp to .cc.
+ * g++.dg/cilk-plus/c++-cilk-for.cpp: Likewise.
+ * g++.dg/cilk-plus/c++-fib.cpp: Likewise.
+ * g++.dg/cilk-plus/c++-n-fib.cpp: Likewise.
+ * g++.dg/cilk-plus/cast.cpp: Likewise.
+ * g++.dg/cilk-plus/cilk-for.cpp: Likewise.
+ * g++.dg/cilk-plus/explicit_ctor.cpp: Likewise.
+ * g++.dg/cilk-plus/fib.cpp: Likewise.
+ * g++.dg/cilk-plus/label_test.cpp: Likewise.
+ * g++.dg/cilk-plus/nested-cilk-for.cpp: Likewise.
+ * g++.dg/cilk-plus/plus-equal-one.cpp: Likewise.
+ * g++.dg/cilk-plus/pragma-simd-for.cpp: Likewise.
+ * g++.dg/cilk-plus/spawnee_inline.cpp: Likewise.
+ * g++.dg/cilk-plus/spawner_inline.cpp: Likewise.
+ * g++.dg/cilk-plus/stl_test.cpp: Likewise.
+ * g++.dg/cilk-plus/test__cilk.cpp: Likewise.
+ * g++.dg/cilk-plus/test_goto.cpp: Likewise.
+ * g++.dg/cilk-plus/test_rts_foo.cpp: Likewise.
+ * g++.dg/cilk-plus/varargs_test.cpp: Likewise.
+ * g++.dg/cilk-plus/cilk-for-incr-decr_not_one.cpp: Renamed to
+ cilk-for-not-1.cc.
+ * g++.dg/cilk-plus/fib-with-struct-parms-and-overloading.cpp: Renamed
+ to fib-struct.cc.
+ * g++.dg/cilk-plus/fib-with-templates.cpp: Renamed to fib-tplt.cc.
+ * g++.dg/cilk-plus/spawn_inside_ctor_dtor.cpp: Renamed to
+ spawn_ctor_dtor.cc.
+ * g++.dg/cilk-plus/stl_test-iterators.cpp: Renamed to stl_iter.cc.
+ * g++.dg/cilk-plus/stl_test-rev-iterators.cpp: Renamed to
+ stl_rev_iter.cc.
+ * g++.dg/cilk-plus/template_cilk_for_plus_equal.cpp: Renamed to
+ tplt_plus_equal.cc.
+ * g++.dg/cilk-plus/cilk_plus.exp: Modified to accept .cc extensions
+ instead of .cpp.
+
2011-09-20 Balaji V. Iyer <balaji.v.iyer@intel.com>
* gcc.dg/cilk-plus/spawner_inline.c: New.
diff --git a/gcc/testsuite/g++.dg/cilk-plus/Clock.cc b/gcc/testsuite/g++.dg/cilk-plus/Clock.cc
new file mode 100644
index 0000000..343c138
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/Clock.cc
@@ -0,0 +1,315 @@
+//***************************************************************************
+//
+// File: Clock.cpp
+//
+// Created: Thu Apr 21 14:53:08 2011
+//
+// Author: Balaji V. Iyer
+//
+// $Id$
+//
+// Description:
+//
+//***************************************************************************
+
+#include <iostream>
+#include <cstdio>
+#include <cstdlib>
+#include <vector>
+#include <algorithm>
+#include <list>
+#include <assert.h>
+#include <cilk/cilk.h>
+#include <algorithm>
+
+
+using namespace std;
+
+class Clock
+{
+private:
+ int hour;
+ int minute;
+ int second;
+
+public:
+ Clock();
+ Clock(int hour, int minute, int seconds);
+ ~Clock();
+ void startClock();
+ void printClock();
+ Clock operator+(Clock &);
+ Clock operator++();
+ Clock operator-(Clock &);
+ Clock operator--();
+};
+
+
+Clock::Clock()
+{
+ hour = 0;
+ minute = 0;
+ second = 0;
+
+}
+
+Clock::Clock (int sethour, int setminute, int setseconds)
+{
+ hour = sethour;
+ minute = setminute;
+ second = setseconds;
+}
+
+
+Clock::~Clock()
+{
+ hour = 0;
+ minute = 0;
+ second = 0;
+}
+
+void Clock::printClock()
+{
+ cout << "Time = " << hour << " : " << minute << " : " <<
+ second << endl;
+
+ return;
+}
+
+Clock Clock::operator++()
+{
+ this->second += 1;
+
+ if (this->second >= 60)
+ {
+ this->second = this->second - 60;
+ this->minute++;
+ if (this->minute >= 60)
+ {
+ this->minute = this->minute-60;
+ this->hour++;
+ }
+ if (this->hour >= 24)
+ {
+ this->hour = this->hour - 24;
+ }
+ }
+
+ return *this;
+}
+
+Clock Clock::operator--()
+{
+ this->second -= 1;
+
+ if (this->second < 0)
+ {
+ this->second = this->second + 60;
+ this->minute++;
+ if (this->minute < 0)
+ {
+ this->minute = this->minute+60;
+ this->hour++;
+ }
+ if (this->hour < 0)
+ {
+ this->hour = this->hour + 24;
+ }
+ }
+
+ return *this;
+}
+
+
+Clock Clock::operator+(Clock ¤tTime)
+{
+ Clock thisVar = *this;
+
+ thisVar.second += currentTime.second;
+
+ if (thisVar.second >= 60)
+ {
+ thisVar.second = thisVar.second - 60;
+ thisVar.minute++;
+ if (thisVar.minute >= 60)
+ {
+ thisVar.minute = thisVar.minute-60;
+ thisVar.hour++;
+ }
+ if (thisVar.hour >= 24)
+ {
+ thisVar.hour = thisVar.hour - 24;
+ }
+ }
+
+ thisVar.minute += currentTime.minute;
+
+ if (thisVar.minute >= 60)
+ {
+ thisVar.minute = thisVar.minute - 60;
+ thisVar.hour++;
+
+ if (thisVar.hour >= 24)
+ {
+ thisVar.hour = thisVar.hour-24;
+ }
+ }
+
+ thisVar.hour += currentTime.hour;
+ thisVar.hour = thisVar.hour % 24;
+
+ return thisVar;
+}
+
+Clock Clock::operator-(Clock ¤tTime)
+{
+ Clock thisVar = *this;
+
+ thisVar.second -= currentTime.second;
+
+ if (thisVar.second < 0)
+ {
+ thisVar.second += 60;
+ thisVar.minute--;
+ if (thisVar.minute < 0)
+ {
+ thisVar.minute = thisVar.minute+60;
+ thisVar.hour--;
+ }
+ if (thisVar.hour < 0)
+ {
+ thisVar.hour = thisVar.hour + 24;
+ }
+ }
+
+ thisVar.minute -= currentTime.minute;
+
+ if (thisVar.minute < 0)
+ {
+ thisVar.minute = thisVar.minute + 60;
+ thisVar.hour--;
+
+ if (thisVar.hour < 0)
+ {
+ thisVar.hour = thisVar.hour+24;
+ }
+ }
+
+ thisVar.hour -= currentTime.hour;
+ if (thisVar.hour < 0)
+ {
+ thisVar.hour += 24;
+ }
+
+ return thisVar;
+}
+
+
+class ClockWall
+{
+private:
+ vector<Clock> clocks;
+ int NumberOfClocks;
+public:
+ ClockWall(int numberOfclocks);
+ ~ClockWall();
+ void DisplayAllClocks();
+ void IncrementAllClocks();
+ void IncrementAllClocksBy(int hr, int min , int sec);
+ void DecrementAllClocks();
+ void DecrementAllClocksBy(int hr, int min , int sec);
+};
+
+
+ClockWall::ClockWall(int numberOfclocks)
+{
+ Clock newClock;
+ assert(numberOfclocks > 0);
+
+ for (int ii = 0; ii < numberOfclocks; ii++)
+ {
+ clocks.push_back(newClock);
+ }
+
+ NumberOfClocks = numberOfclocks;
+}
+
+ClockWall::~ClockWall()
+{
+ clocks.clear();
+}
+
+
+void ClockWall::DisplayAllClocks()
+{
+ cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
+ {
+ cout << "Clock Number " << ii << " ";
+ clocks[ii].printClock();
+ }
+
+ return;
+}
+
+void ClockWall::IncrementAllClocksBy (int hr, int min, int sec)
+{
+
+ Clock incrTime(hr, min, sec);
+
+ cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
+ {
+ clocks[ii] = clocks[ii] + incrTime;
+ }
+
+ return;
+}
+
+void ClockWall::IncrementAllClocks ()
+{
+ cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
+ {
+ ++clocks[ii];
+ }
+ return;
+}
+
+void ClockWall::DecrementAllClocks ()
+{
+ cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
+ {
+ --clocks[ii];
+ }
+ return;
+}
+void ClockWall::DecrementAllClocksBy (int hr, int min, int sec)
+{
+
+ Clock incrTime(hr, min, sec);
+
+ cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
+ {
+ clocks[ii] = clocks[ii] - incrTime;
+ }
+
+ return;
+}
+
+
+
+int main(void)
+{
+ ClockWall cWall(5);
+
+ cWall.DisplayAllClocks();
+
+ cWall.IncrementAllClocksBy(1,60,60);
+
+ cWall.DecrementAllClocksBy(3,0,0);
+
+
+
+ cWall.DisplayAllClocks();
+
+ return 0;
+}
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/Clock.cpp b/gcc/testsuite/g++.dg/cilk-plus/Clock.cpp
deleted file mode 100644
index 343c138..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/Clock.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-//***************************************************************************
-//
-// File: Clock.cpp
-//
-// Created: Thu Apr 21 14:53:08 2011
-//
-// Author: Balaji V. Iyer
-//
-// $Id$
-//
-// Description:
-//
-//***************************************************************************
-
-#include <iostream>
-#include <cstdio>
-#include <cstdlib>
-#include <vector>
-#include <algorithm>
-#include <list>
-#include <assert.h>
-#include <cilk/cilk.h>
-#include <algorithm>
-
-
-using namespace std;
-
-class Clock
-{
-private:
- int hour;
- int minute;
- int second;
-
-public:
- Clock();
- Clock(int hour, int minute, int seconds);
- ~Clock();
- void startClock();
- void printClock();
- Clock operator+(Clock &);
- Clock operator++();
- Clock operator-(Clock &);
- Clock operator--();
-};
-
-
-Clock::Clock()
-{
- hour = 0;
- minute = 0;
- second = 0;
-
-}
-
-Clock::Clock (int sethour, int setminute, int setseconds)
-{
- hour = sethour;
- minute = setminute;
- second = setseconds;
-}
-
-
-Clock::~Clock()
-{
- hour = 0;
- minute = 0;
- second = 0;
-}
-
-void Clock::printClock()
-{
- cout << "Time = " << hour << " : " << minute << " : " <<
- second << endl;
-
- return;
-}
-
-Clock Clock::operator++()
-{
- this->second += 1;
-
- if (this->second >= 60)
- {
- this->second = this->second - 60;
- this->minute++;
- if (this->minute >= 60)
- {
- this->minute = this->minute-60;
- this->hour++;
- }
- if (this->hour >= 24)
- {
- this->hour = this->hour - 24;
- }
- }
-
- return *this;
-}
-
-Clock Clock::operator--()
-{
- this->second -= 1;
-
- if (this->second < 0)
- {
- this->second = this->second + 60;
- this->minute++;
- if (this->minute < 0)
- {
- this->minute = this->minute+60;
- this->hour++;
- }
- if (this->hour < 0)
- {
- this->hour = this->hour + 24;
- }
- }
-
- return *this;
-}
-
-
-Clock Clock::operator+(Clock ¤tTime)
-{
- Clock thisVar = *this;
-
- thisVar.second += currentTime.second;
-
- if (thisVar.second >= 60)
- {
- thisVar.second = thisVar.second - 60;
- thisVar.minute++;
- if (thisVar.minute >= 60)
- {
- thisVar.minute = thisVar.minute-60;
- thisVar.hour++;
- }
- if (thisVar.hour >= 24)
- {
- thisVar.hour = thisVar.hour - 24;
- }
- }
-
- thisVar.minute += currentTime.minute;
-
- if (thisVar.minute >= 60)
- {
- thisVar.minute = thisVar.minute - 60;
- thisVar.hour++;
-
- if (thisVar.hour >= 24)
- {
- thisVar.hour = thisVar.hour-24;
- }
- }
-
- thisVar.hour += currentTime.hour;
- thisVar.hour = thisVar.hour % 24;
-
- return thisVar;
-}
-
-Clock Clock::operator-(Clock ¤tTime)
-{
- Clock thisVar = *this;
-
- thisVar.second -= currentTime.second;
-
- if (thisVar.second < 0)
- {
- thisVar.second += 60;
- thisVar.minute--;
- if (thisVar.minute < 0)
- {
- thisVar.minute = thisVar.minute+60;
- thisVar.hour--;
- }
- if (thisVar.hour < 0)
- {
- thisVar.hour = thisVar.hour + 24;
- }
- }
-
- thisVar.minute -= currentTime.minute;
-
- if (thisVar.minute < 0)
- {
- thisVar.minute = thisVar.minute + 60;
- thisVar.hour--;
-
- if (thisVar.hour < 0)
- {
- thisVar.hour = thisVar.hour+24;
- }
- }
-
- thisVar.hour -= currentTime.hour;
- if (thisVar.hour < 0)
- {
- thisVar.hour += 24;
- }
-
- return thisVar;
-}
-
-
-class ClockWall
-{
-private:
- vector<Clock> clocks;
- int NumberOfClocks;
-public:
- ClockWall(int numberOfclocks);
- ~ClockWall();
- void DisplayAllClocks();
- void IncrementAllClocks();
- void IncrementAllClocksBy(int hr, int min , int sec);
- void DecrementAllClocks();
- void DecrementAllClocksBy(int hr, int min , int sec);
-};
-
-
-ClockWall::ClockWall(int numberOfclocks)
-{
- Clock newClock;
- assert(numberOfclocks > 0);
-
- for (int ii = 0; ii < numberOfclocks; ii++)
- {
- clocks.push_back(newClock);
- }
-
- NumberOfClocks = numberOfclocks;
-}
-
-ClockWall::~ClockWall()
-{
- clocks.clear();
-}
-
-
-void ClockWall::DisplayAllClocks()
-{
- cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
- {
- cout << "Clock Number " << ii << " ";
- clocks[ii].printClock();
- }
-
- return;
-}
-
-void ClockWall::IncrementAllClocksBy (int hr, int min, int sec)
-{
-
- Clock incrTime(hr, min, sec);
-
- cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
- {
- clocks[ii] = clocks[ii] + incrTime;
- }
-
- return;
-}
-
-void ClockWall::IncrementAllClocks ()
-{
- cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
- {
- ++clocks[ii];
- }
- return;
-}
-
-void ClockWall::DecrementAllClocks ()
-{
- cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
- {
- --clocks[ii];
- }
- return;
-}
-void ClockWall::DecrementAllClocksBy (int hr, int min, int sec)
-{
-
- Clock incrTime(hr, min, sec);
-
- cilk_for (int ii = 0; ii < NumberOfClocks; ii++)
- {
- clocks[ii] = clocks[ii] - incrTime;
- }
-
- return;
-}
-
-
-
-int main(void)
-{
- ClockWall cWall(5);
-
- cWall.DisplayAllClocks();
-
- cWall.IncrementAllClocksBy(1,60,60);
-
- cWall.DecrementAllClocksBy(3,0,0);
-
-
-
- cWall.DisplayAllClocks();
-
- return 0;
-}
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/c++-cilk-for.cc b/gcc/testsuite/g++.dg/cilk-plus/c++-cilk-for.cc
new file mode 100644
index 0000000..5e9cd23
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/c++-cilk-for.cc
@@ -0,0 +1,74 @@
+#include <iostream>
+#include <cstdio>
+#include <cstring>
+
+#include <cilk/cilk.h>
+#define NUMBER 50
+using namespace std;
+
+class CClass {
+private:
+ int x[NUMBER],y[NUMBER],r[NUMBER];
+public:
+ void PrintValues();
+ CClass (int, int);
+
+#if 1
+ int SomeCalc();
+ ~CClass ();
+ virtual int some_function(int a, int b) {};
+#endif
+
+};
+
+CClass::CClass(int a, int b)
+{
+ cilk_for (int ii = 0; ii < NUMBER; ++ii) {
+ x[ii]=5;
+ y[ii]=9;
+ r[ii]=33;
+ }
+}
+#if 1
+CClass::~CClass()
+{
+ cilk_for (int ii = 0; ii < NUMBER; ii++) {
+ x[ii]=0;
+ y[ii]=0;
+ r[ii]=0;
+ }
+}
+
+int CClass::SomeCalc()
+{
+ cilk_for (int jj = 0;jj < NUMBER; jj++) {
+ r[jj] = x[jj] * y[jj];
+ }
+
+ return (r[9]+r[8]+r[7]+r[6]+r[5]+r[4]+r[3]+r[2]+r[1]+r[0]);
+}
+#endif
+void CClass::PrintValues()
+{
+ for(int ii = 0; ii < NUMBER; ii++)
+ {
+ printf("X[%2d]=%2d Y[%2d]=%2d r[%2d]=%3d\n",ii,x[ii],ii,y[ii],ii,r[ii]);
+ }
+ return;
+}
+
+int main(void)
+{
+ CClass vars(5,9);
+
+ cout << "Array values BEFORE The Calculation: " << endl;
+ vars.PrintValues();
+
+ vars.SomeCalc();
+
+
+ cout << "Array values AFTER The Calculation: " << endl;
+ vars.PrintValues();
+ return 5;
+}
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/c++-cilk-for.cpp b/gcc/testsuite/g++.dg/cilk-plus/c++-cilk-for.cpp
deleted file mode 100644
index 5e9cd23..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/c++-cilk-for.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <iostream>
-#include <cstdio>
-#include <cstring>
-
-#include <cilk/cilk.h>
-#define NUMBER 50
-using namespace std;
-
-class CClass {
-private:
- int x[NUMBER],y[NUMBER],r[NUMBER];
-public:
- void PrintValues();
- CClass (int, int);
-
-#if 1
- int SomeCalc();
- ~CClass ();
- virtual int some_function(int a, int b) {};
-#endif
-
-};
-
-CClass::CClass(int a, int b)
-{
- cilk_for (int ii = 0; ii < NUMBER; ++ii) {
- x[ii]=5;
- y[ii]=9;
- r[ii]=33;
- }
-}
-#if 1
-CClass::~CClass()
-{
- cilk_for (int ii = 0; ii < NUMBER; ii++) {
- x[ii]=0;
- y[ii]=0;
- r[ii]=0;
- }
-}
-
-int CClass::SomeCalc()
-{
- cilk_for (int jj = 0;jj < NUMBER; jj++) {
- r[jj] = x[jj] * y[jj];
- }
-
- return (r[9]+r[8]+r[7]+r[6]+r[5]+r[4]+r[3]+r[2]+r[1]+r[0]);
-}
-#endif
-void CClass::PrintValues()
-{
- for(int ii = 0; ii < NUMBER; ii++)
- {
- printf("X[%2d]=%2d Y[%2d]=%2d r[%2d]=%3d\n",ii,x[ii],ii,y[ii],ii,r[ii]);
- }
- return;
-}
-
-int main(void)
-{
- CClass vars(5,9);
-
- cout << "Array values BEFORE The Calculation: " << endl;
- vars.PrintValues();
-
- vars.SomeCalc();
-
-
- cout << "Array values AFTER The Calculation: " << endl;
- vars.PrintValues();
- return 5;
-}
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/c++-fib.cc b/gcc/testsuite/g++.dg/cilk-plus/c++-fib.cc
new file mode 100644
index 0000000..71b694c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/c++-fib.cc
@@ -0,0 +1,101 @@
+//***************************************************************************
+//
+// File: c++-fib.cpp
+//
+// Created: Tue Feb 15 13:45:06 2011
+//
+// Author: Balaji V. Iyer
+//
+// $Id$
+//
+// Description:
+//
+//***************************************************************************
+
+#include <iostream>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cilk/cilk.h>
+#define NUMBER 40
+
+using namespace std;
+
+class Fib
+{
+private:
+ int *fibNumbers;
+ int createNumbers(int currentNumber);
+public:
+ Fib(int n);
+ ~Fib();
+ void populateArray(int n);
+ void PrintNumbers(int n);
+};
+
+Fib::Fib(int n)
+{
+ fibNumbers = new int[n+1];
+}
+
+Fib::~Fib()
+{
+ delete fibNumbers;
+}
+
+void Fib::populateArray(int n)
+{
+ for (int ii = 1; ii <= n; ii++)
+ {
+ fibNumbers[ii] = createNumbers(ii);
+ }
+}
+
+void Fib::PrintNumbers(int n)
+{
+ for (int ii = 1; ii <= n; ii++)
+ {
+ cout << "Fib(" << (ii) << ") = " << fibNumbers[ii] << endl;
+ }
+ return;
+}
+
+int Fib::createNumbers(int currentNumber)
+{
+
+ if(currentNumber < 2)
+ {
+ return currentNumber;
+ }
+ else
+ {
+ int x = 0, y = 0, z= 0;
+ x = cilk_spawn createNumbers(currentNumber-1);
+ y = createNumbers(currentNumber - 2);
+ cilk_sync;
+ return (x+y+z);
+ }
+}
+
+int main(int argc, char **argv)
+{
+ int number_of_iterations;
+
+ if (argc == 2)
+ {
+ number_of_iterations = atoi(argv[1]);
+ }
+ else
+ {
+ number_of_iterations = NUMBER;
+ }
+
+ Fib fib(number_of_iterations);
+
+ fib.populateArray(number_of_iterations);
+
+ fib.PrintNumbers(number_of_iterations);
+ return 0;
+}
+
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/c++-fib.cpp b/gcc/testsuite/g++.dg/cilk-plus/c++-fib.cpp
deleted file mode 100644
index 71b694c..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/c++-fib.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//***************************************************************************
-//
-// File: c++-fib.cpp
-//
-// Created: Tue Feb 15 13:45:06 2011
-//
-// Author: Balaji V. Iyer
-//
-// $Id$
-//
-// Description:
-//
-//***************************************************************************
-
-#include <iostream>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cilk/cilk.h>
-#define NUMBER 40
-
-using namespace std;
-
-class Fib
-{
-private:
- int *fibNumbers;
- int createNumbers(int currentNumber);
-public:
- Fib(int n);
- ~Fib();
- void populateArray(int n);
- void PrintNumbers(int n);
-};
-
-Fib::Fib(int n)
-{
- fibNumbers = new int[n+1];
-}
-
-Fib::~Fib()
-{
- delete fibNumbers;
-}
-
-void Fib::populateArray(int n)
-{
- for (int ii = 1; ii <= n; ii++)
- {
- fibNumbers[ii] = createNumbers(ii);
- }
-}
-
-void Fib::PrintNumbers(int n)
-{
- for (int ii = 1; ii <= n; ii++)
- {
- cout << "Fib(" << (ii) << ") = " << fibNumbers[ii] << endl;
- }
- return;
-}
-
-int Fib::createNumbers(int currentNumber)
-{
-
- if(currentNumber < 2)
- {
- return currentNumber;
- }
- else
- {
- int x = 0, y = 0, z= 0;
- x = cilk_spawn createNumbers(currentNumber-1);
- y = createNumbers(currentNumber - 2);
- cilk_sync;
- return (x+y+z);
- }
-}
-
-int main(int argc, char **argv)
-{
- int number_of_iterations;
-
- if (argc == 2)
- {
- number_of_iterations = atoi(argv[1]);
- }
- else
- {
- number_of_iterations = NUMBER;
- }
-
- Fib fib(number_of_iterations);
-
- fib.populateArray(number_of_iterations);
-
- fib.PrintNumbers(number_of_iterations);
- return 0;
-}
-
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/c++-n-fib.cc b/gcc/testsuite/g++.dg/cilk-plus/c++-n-fib.cc
new file mode 100644
index 0000000..445d89b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/c++-n-fib.cc
@@ -0,0 +1,128 @@
+//*************************************************************************** //
+// File: c++-n-fib.cpp
+//
+// Created: Tue Feb 15 13:45:06 2011
+//
+// Author: Balaji V. Iyer
+//
+// $Id$
+//
+// Description:
+//
+//***************************************************************************
+
+#include <iostream>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <assert.h>
+#include <cilk/cilk.h>
+#define NUMBER 30
+
+using namespace std;
+
+class Fib
+{
+private:
+ int iterations;
+ int *fibNumbers;
+ int n;
+ int createNumbers(int currentNumber);
+public:
+ Fib(int nn, int iter);
+ ~Fib();
+ void populateArray();
+ void PrintNumbers();
+};
+
+Fib::Fib(int nn,int iter)
+{
+ fibNumbers = new int[nn];
+
+ for (int ii = 0; ii < nn; ii++)
+ fibNumbers[ii] = 0;
+ iterations=iter;
+ n=nn;
+}
+
+Fib::~Fib()
+{
+ delete fibNumbers;
+}
+
+void Fib::populateArray()
+{
+ for (int ii = 0; ii < n; ii++)
+ {
+ fibNumbers[ii] = createNumbers(ii);
+ // cout << "FibNumbers[" << ii << "]: " << fibNumbers[ii] << endl;
+ }
+}
+
+void Fib::PrintNumbers()
+{
+ for (int ii = 0; ii < n; ii++)
+ {
+ cout << "Fib(" << (ii+1) << ") = " << fibNumbers[ii] << endl;
+ }
+ return;
+}
+
+int Fib::createNumbers(int currentNumber)
+{
+ if ((currentNumber < iterations) || (iterations < 2))
+ {
+ return currentNumber;
+ }
+ else
+ {
+ int *x, y = 0, z= 0;
+ int input= 0;
+ x = new int[iterations];
+ assert (x != NULL);
+
+ for (int ii = 0; ii < iterations; ii++) {
+ x[ii]=cilk_spawn createNumbers(currentNumber-ii-1);
+ }
+ /*y = createNumbers(currentNumber-iterations-1);*/
+ cilk_sync;
+ for (int ii = 0; ii < iterations; ii++) {
+ y += x[ii];
+ }
+ return (y);
+ }
+}
+
+int main(int argc, char **argv)
+{
+
+ int iter = 0;
+ int number_of_fibs = 0;
+
+ if (argc == 3)
+ {
+ iter = atoi (argv[1]);
+ number_of_fibs = atoi(argv[2]);
+ }
+ else if (argc == 2)
+ {
+ iter=atoi(argv[1]);
+ cout << "Assuming Number of Nibonacci = " << NUMBER << endl;
+ number_of_fibs = NUMBER;
+ }
+ else
+ {
+ cerr << "<EXECUTABLE> <NUMBER OF PREVIOUS ITERATION SUMS>" << endl;
+ cerr << "Assuming Iteration = 1 and Number of Nibonacci = " << NUMBER << endl;
+ iter = 1;
+ number_of_fibs = NUMBER;
+ }
+
+
+
+ Fib fib(number_of_fibs,iter);
+ fib.populateArray();
+ fib.PrintNumbers();
+ return 0;
+}
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/c++-n-fib.cpp b/gcc/testsuite/g++.dg/cilk-plus/c++-n-fib.cpp
deleted file mode 100644
index 445d89b..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/c++-n-fib.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//*************************************************************************** //
-// File: c++-n-fib.cpp
-//
-// Created: Tue Feb 15 13:45:06 2011
-//
-// Author: Balaji V. Iyer
-//
-// $Id$
-//
-// Description:
-//
-//***************************************************************************
-
-#include <iostream>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <assert.h>
-#include <cilk/cilk.h>
-#define NUMBER 30
-
-using namespace std;
-
-class Fib
-{
-private:
- int iterations;
- int *fibNumbers;
- int n;
- int createNumbers(int currentNumber);
-public:
- Fib(int nn, int iter);
- ~Fib();
- void populateArray();
- void PrintNumbers();
-};
-
-Fib::Fib(int nn,int iter)
-{
- fibNumbers = new int[nn];
-
- for (int ii = 0; ii < nn; ii++)
- fibNumbers[ii] = 0;
- iterations=iter;
- n=nn;
-}
-
-Fib::~Fib()
-{
- delete fibNumbers;
-}
-
-void Fib::populateArray()
-{
- for (int ii = 0; ii < n; ii++)
- {
- fibNumbers[ii] = createNumbers(ii);
- // cout << "FibNumbers[" << ii << "]: " << fibNumbers[ii] << endl;
- }
-}
-
-void Fib::PrintNumbers()
-{
- for (int ii = 0; ii < n; ii++)
- {
- cout << "Fib(" << (ii+1) << ") = " << fibNumbers[ii] << endl;
- }
- return;
-}
-
-int Fib::createNumbers(int currentNumber)
-{
- if ((currentNumber < iterations) || (iterations < 2))
- {
- return currentNumber;
- }
- else
- {
- int *x, y = 0, z= 0;
- int input= 0;
- x = new int[iterations];
- assert (x != NULL);
-
- for (int ii = 0; ii < iterations; ii++) {
- x[ii]=cilk_spawn createNumbers(currentNumber-ii-1);
- }
- /*y = createNumbers(currentNumber-iterations-1);*/
- cilk_sync;
- for (int ii = 0; ii < iterations; ii++) {
- y += x[ii];
- }
- return (y);
- }
-}
-
-int main(int argc, char **argv)
-{
-
- int iter = 0;
- int number_of_fibs = 0;
-
- if (argc == 3)
- {
- iter = atoi (argv[1]);
- number_of_fibs = atoi(argv[2]);
- }
- else if (argc == 2)
- {
- iter=atoi(argv[1]);
- cout << "Assuming Number of Nibonacci = " << NUMBER << endl;
- number_of_fibs = NUMBER;
- }
- else
- {
- cerr << "<EXECUTABLE> <NUMBER OF PREVIOUS ITERATION SUMS>" << endl;
- cerr << "Assuming Iteration = 1 and Number of Nibonacci = " << NUMBER << endl;
- iter = 1;
- number_of_fibs = NUMBER;
- }
-
-
-
- Fib fib(number_of_fibs,iter);
- fib.populateArray();
- fib.PrintNumbers();
- return 0;
-}
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cast.cc b/gcc/testsuite/g++.dg/cilk-plus/cast.cc
new file mode 100644
index 0000000..c1ef323
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/cast.cc
@@ -0,0 +1,18 @@
+#include <cilk/cilk.h>
+#include <cstdio>
+
+struct BruceWillis {
+ BruceWillis (int i) : m(i) { }
+ ~BruceWillis () { }
+ operator int () { return m; }
+ BruceWillis operator++ () { ++m; return *this; }
+ int m;
+};
+
+int main () {
+ cilk_for (BruceWillis bw(0);
+ bw < (int)BruceWillis(16); // This is the problematic line.
+ ++bw);
+ std::puts("done.");
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cast.cpp b/gcc/testsuite/g++.dg/cilk-plus/cast.cpp
deleted file mode 100644
index c1ef323..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/cast.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <cilk/cilk.h>
-#include <cstdio>
-
-struct BruceWillis {
- BruceWillis (int i) : m(i) { }
- ~BruceWillis () { }
- operator int () { return m; }
- BruceWillis operator++ () { ++m; return *this; }
- int m;
-};
-
-int main () {
- cilk_for (BruceWillis bw(0);
- bw < (int)BruceWillis(16); // This is the problematic line.
- ++bw);
- std::puts("done.");
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-for-incr-decr-not-one.cpp b/gcc/testsuite/g++.dg/cilk-plus/cilk-for-incr-decr-not-one.cpp
deleted file mode 100644
index 87db6b6..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/cilk-for-incr-decr-not-one.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
- #include <stdio.h>
-#include <cilk/cilk.h>
-
-#define SIZE 3
-
-int main() {
- int *q;
- int array[SIZE];
-
- for (int *p = array; p < array + SIZE; ++p) {
- *p = 2;
- printf("(p = %08x\t*p = %08x)\n", p, *p);
- fflush(stdout);
- }
- fprintf(stdout, "cilk_for increment by 2\n");
- fflush(stdout);
- cilk_for (int *p = array ; p < array + SIZE; p += 2) {
- *p = 16;
- printf("(p = %08x\t*p = %08x)\n", p, *p);
- fflush(stdout);
- }
-
- fprintf(stdout, "cilk_for decrement by 2 (reading reverse)\n");
- fflush(stdout);
- cilk_for (int *p = array+SIZE-1 ; p >= array; p -= 2) {
- *p = 9;
- printf("(p = %08x\t*p = %08x)\n", p, *p);
- fflush(stdout);
- }
-
- fprintf(stdout, "cilk_for reading reverse\n");
- fflush(stdout);
- for (int *p = array+ SIZE-1 ; p >= array ; p -= 1) {
- printf("(p = %08x\t*p = %08x\t)\n", p, *p);
- fflush(stdout);
- }
-
- puts ("done.");
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-for-not-1.cc b/gcc/testsuite/g++.dg/cilk-plus/cilk-for-not-1.cc
new file mode 100644
index 0000000..87db6b6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/cilk-for-not-1.cc
@@ -0,0 +1,40 @@
+ #include <stdio.h>
+#include <cilk/cilk.h>
+
+#define SIZE 3
+
+int main() {
+ int *q;
+ int array[SIZE];
+
+ for (int *p = array; p < array + SIZE; ++p) {
+ *p = 2;
+ printf("(p = %08x\t*p = %08x)\n", p, *p);
+ fflush(stdout);
+ }
+ fprintf(stdout, "cilk_for increment by 2\n");
+ fflush(stdout);
+ cilk_for (int *p = array ; p < array + SIZE; p += 2) {
+ *p = 16;
+ printf("(p = %08x\t*p = %08x)\n", p, *p);
+ fflush(stdout);
+ }
+
+ fprintf(stdout, "cilk_for decrement by 2 (reading reverse)\n");
+ fflush(stdout);
+ cilk_for (int *p = array+SIZE-1 ; p >= array; p -= 2) {
+ *p = 9;
+ printf("(p = %08x\t*p = %08x)\n", p, *p);
+ fflush(stdout);
+ }
+
+ fprintf(stdout, "cilk_for reading reverse\n");
+ fflush(stdout);
+ for (int *p = array+ SIZE-1 ; p >= array ; p -= 1) {
+ printf("(p = %08x\t*p = %08x\t)\n", p, *p);
+ fflush(stdout);
+ }
+
+ puts ("done.");
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-for.cc b/gcc/testsuite/g++.dg/cilk-plus/cilk-for.cc
new file mode 100644
index 0000000..284ba13
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/cilk-for.cc
@@ -0,0 +1,50 @@
+ #include<iostream>
+#include <stdio.h>
+#include <string.h>
+#include <cilk/cilk.h>
+
+using namespace std;
+
+int j[10];
+int main2(void);
+#if 1
+int main(int argc, char **argv)
+{
+ if (argc == 1)
+ main2();
+
+ /* THIS LOOP IS WRONG! I HAVE PURPOSELY KEPT IT HERE
+ * TO SEE IF THE CILK FOR IS WORKING. THE PRINTOUTS
+ * SHOULD NOT PRINT CORRECTLY!
+ */
+ cilk_for (int jj = 0; jj < 10; jj++) {
+
+ cout << "J[" << jj << "] = " << j[jj] << endl;
+
+ }
+
+ cout << endl << endl;
+
+ /* Now, this loop should print correctly */
+ for (int jj = 0; jj < 10; jj++) {
+ cout << "J[" << jj << "] = " << j[jj] << endl;
+ }
+
+ return 0;
+
+}
+
+#endif
+
+
+int main2(void)
+{
+cilk_for (int ii = 0; ii < 10; ii++)
+{
+printf("Hello World %d\n", ii);
+j[ii]=ii;
+}
+
+return j[9];
+}
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-for.cpp b/gcc/testsuite/g++.dg/cilk-plus/cilk-for.cpp
deleted file mode 100644
index 284ba13..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/cilk-for.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
- #include<iostream>
-#include <stdio.h>
-#include <string.h>
-#include <cilk/cilk.h>
-
-using namespace std;
-
-int j[10];
-int main2(void);
-#if 1
-int main(int argc, char **argv)
-{
- if (argc == 1)
- main2();
-
- /* THIS LOOP IS WRONG! I HAVE PURPOSELY KEPT IT HERE
- * TO SEE IF THE CILK FOR IS WORKING. THE PRINTOUTS
- * SHOULD NOT PRINT CORRECTLY!
- */
- cilk_for (int jj = 0; jj < 10; jj++) {
-
- cout << "J[" << jj << "] = " << j[jj] << endl;
-
- }
-
- cout << endl << endl;
-
- /* Now, this loop should print correctly */
- for (int jj = 0; jj < 10; jj++) {
- cout << "J[" << jj << "] = " << j[jj] << endl;
- }
-
- return 0;
-
-}
-
-#endif
-
-
-int main2(void)
-{
-cilk_for (int ii = 0; ii < 10; ii++)
-{
-printf("Hello World %d\n", ii);
-j[ii]=ii;
-}
-
-return j[9];
-}
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp b/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp
index 8a9fdd4..45a362a 100644
--- a/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp
+++ b/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp
@@ -18,6 +18,6 @@
load_lib g++-dg.exp
dg-init
-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cpp]] " -w -lcilkrts -ldl -I $srcdir/../../libcilkrts/include " " "
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cc]] " -w -lcilkrts -ldl -I $srcdir/../../libcilkrts/include " " "
dg-finish
diff --git a/gcc/testsuite/g++.dg/cilk-plus/explicit_ctor.cc b/gcc/testsuite/g++.dg/cilk-plus/explicit_ctor.cc
new file mode 100644
index 0000000..0e3bd14
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/explicit_ctor.cc
@@ -0,0 +1,24 @@
+#include <cilk/cilk.h>
+#include <cstdio>
+
+struct BruceBoxleitner {
+ int m;
+ BruceBoxleitner (int n = 0) : m(n) { }
+ BruceBoxleitner operator--() { --m; return *this; }
+};
+
+int operator- (BruceBoxleitner a, BruceBoxleitner b) { return a.m - b.m; }
+
+struct BruceLee {
+ int m;
+ explicit BruceLee (int n) : m(n) { }
+};
+
+bool operator> (BruceBoxleitner a, BruceLee b) { return a.m > b.m; }
+int operator- (BruceBoxleitner a, BruceLee b) { return a.m - b.m; }
+
+int main () {
+ cilk_for (BruceBoxleitner i = 10; i > BruceLee(0); --i);
+ std::puts("done.");
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/explicit_ctor.cpp b/gcc/testsuite/g++.dg/cilk-plus/explicit_ctor.cpp
deleted file mode 100644
index 0e3bd14..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/explicit_ctor.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <cilk/cilk.h>
-#include <cstdio>
-
-struct BruceBoxleitner {
- int m;
- BruceBoxleitner (int n = 0) : m(n) { }
- BruceBoxleitner operator--() { --m; return *this; }
-};
-
-int operator- (BruceBoxleitner a, BruceBoxleitner b) { return a.m - b.m; }
-
-struct BruceLee {
- int m;
- explicit BruceLee (int n) : m(n) { }
-};
-
-bool operator> (BruceBoxleitner a, BruceLee b) { return a.m > b.m; }
-int operator- (BruceBoxleitner a, BruceLee b) { return a.m - b.m; }
-
-int main () {
- cilk_for (BruceBoxleitner i = 10; i > BruceLee(0); --i);
- std::puts("done.");
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/fib-struct.cc b/gcc/testsuite/g++.dg/cilk-plus/fib-struct.cc
new file mode 100644
index 0000000..5ba4013
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/fib-struct.cc
@@ -0,0 +1,56 @@
+#include <cilk/cilk.h>
+#include <cstdio>
+#include <pthread.h>
+#define FIB_PARAMETER 40
+struct fib_struct
+{
+ int x;
+ int *y;
+ int z[3];
+ struct fib_struct *ptr_next;
+ struct fib_struct operator+(struct fib_struct &other) {
+ struct fib_struct z ;
+ z.x = (*this).x + (other.x);
+ return z;
+ }
+ struct fib_struct operator-(int other) {
+ struct fib_struct z ;
+ z.x = this->x - other;
+ return z;
+ }
+};
+
+struct fib_struct fib (struct fib_struct z) {
+ if (z.x < 2) return z;
+ struct fib_struct a = cilk_spawn fib(z - 1);
+ struct fib_struct b = fib(z - 2);
+ cilk_sync;
+ struct fib_struct c = a + b;
+ return (a+b);
+}
+
+
+int sfib(int x)
+{
+ if (x < 2) return x;
+ int a = sfib(x-1);
+ int b = sfib(x-2);
+ return (a+b);
+}
+
+int main () {
+ struct fib_struct z ;
+ z.x = FIB_PARAMETER;
+
+ std::printf("fib(%d) = %d\n", FIB_PARAMETER, fib(z).x);
+ int parallel_fib = fib(z).x;
+ int serial_fib = sfib(FIB_PARAMETER);
+ if (serial_fib == parallel_fib)
+ std::puts("correct.");
+ else
+ std::puts("error.");
+
+ return 0;
+}
+
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/fib-tplt.cc b/gcc/testsuite/g++.dg/cilk-plus/fib-tplt.cc
new file mode 100644
index 0000000..21df277
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/fib-tplt.cc
@@ -0,0 +1,57 @@
+
+#include <cilk/cilk.h>
+#include <cstdio>
+#include <pthread.h>
+struct fib_struct
+{
+ int x;
+ int *y;
+ int z[3];
+ struct fib_struct *ptr_next;
+ struct fib_struct operator+(struct fib_struct &other) {
+ struct fib_struct z ;
+ z.x = (*this).x + (other.x);
+ return z;
+ }
+ struct fib_struct operator-(int other) {
+ struct fib_struct z ;
+ z.x = this->x - other;
+ return z;
+ }
+ bool operator<(int number) {
+ return (this->x < number);
+ }
+
+};
+
+template <typename T>
+T fib (T z) {
+ if (z < 2) return z;
+ T a = cilk_spawn fib<T>(z - 1);
+ T b = fib<T>(z - 2);
+ cilk_sync;
+ T c = a + b;
+ return (a+b);
+}
+
+
+int sfib(int x)
+{
+ if (x < 2) return x;
+ int a = sfib(x-1);
+ int b = sfib(x-2);
+ return (a+b);
+}
+
+int main () {
+ int z = 40;
+ std::printf("fib(%d) = %d\n", 40, fib<int>(z));
+ int parallel_fib = fib<int>(z);
+ int serial_fib = sfib(40);
+ if (serial_fib == parallel_fib)
+ std::puts("correct.");
+ else
+ std::puts("error.");
+
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/fib-with-struct-params-and-overloading.cpp b/gcc/testsuite/g++.dg/cilk-plus/fib-with-struct-params-and-overloading.cpp
deleted file mode 100644
index 5ba4013..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/fib-with-struct-params-and-overloading.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <cilk/cilk.h>
-#include <cstdio>
-#include <pthread.h>
-#define FIB_PARAMETER 40
-struct fib_struct
-{
- int x;
- int *y;
- int z[3];
- struct fib_struct *ptr_next;
- struct fib_struct operator+(struct fib_struct &other) {
- struct fib_struct z ;
- z.x = (*this).x + (other.x);
- return z;
- }
- struct fib_struct operator-(int other) {
- struct fib_struct z ;
- z.x = this->x - other;
- return z;
- }
-};
-
-struct fib_struct fib (struct fib_struct z) {
- if (z.x < 2) return z;
- struct fib_struct a = cilk_spawn fib(z - 1);
- struct fib_struct b = fib(z - 2);
- cilk_sync;
- struct fib_struct c = a + b;
- return (a+b);
-}
-
-
-int sfib(int x)
-{
- if (x < 2) return x;
- int a = sfib(x-1);
- int b = sfib(x-2);
- return (a+b);
-}
-
-int main () {
- struct fib_struct z ;
- z.x = FIB_PARAMETER;
-
- std::printf("fib(%d) = %d\n", FIB_PARAMETER, fib(z).x);
- int parallel_fib = fib(z).x;
- int serial_fib = sfib(FIB_PARAMETER);
- if (serial_fib == parallel_fib)
- std::puts("correct.");
- else
- std::puts("error.");
-
- return 0;
-}
-
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/fib-with-templates.cpp b/gcc/testsuite/g++.dg/cilk-plus/fib-with-templates.cpp
deleted file mode 100644
index 21df277..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/fib-with-templates.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-
-#include <cilk/cilk.h>
-#include <cstdio>
-#include <pthread.h>
-struct fib_struct
-{
- int x;
- int *y;
- int z[3];
- struct fib_struct *ptr_next;
- struct fib_struct operator+(struct fib_struct &other) {
- struct fib_struct z ;
- z.x = (*this).x + (other.x);
- return z;
- }
- struct fib_struct operator-(int other) {
- struct fib_struct z ;
- z.x = this->x - other;
- return z;
- }
- bool operator<(int number) {
- return (this->x < number);
- }
-
-};
-
-template <typename T>
-T fib (T z) {
- if (z < 2) return z;
- T a = cilk_spawn fib<T>(z - 1);
- T b = fib<T>(z - 2);
- cilk_sync;
- T c = a + b;
- return (a+b);
-}
-
-
-int sfib(int x)
-{
- if (x < 2) return x;
- int a = sfib(x-1);
- int b = sfib(x-2);
- return (a+b);
-}
-
-int main () {
- int z = 40;
- std::printf("fib(%d) = %d\n", 40, fib<int>(z));
- int parallel_fib = fib<int>(z);
- int serial_fib = sfib(40);
- if (serial_fib == parallel_fib)
- std::puts("correct.");
- else
- std::puts("error.");
-
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/fib.cc b/gcc/testsuite/g++.dg/cilk-plus/fib.cc
new file mode 100644
index 0000000..c119662
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/fib.cc
@@ -0,0 +1,50 @@
+//***************************************************************************
+//
+// File: fib.c
+//
+// Created: Tue Oct 26 16:24:01 2010
+//
+// Author: Balaji V. Iyer
+//
+// $Id$
+//
+// Description:$Log$
+//
+//***************************************************************************
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <cilk/cilk.h>
+
+int fib(int );
+
+int main(int argc, char **argv)
+{
+ int x = 0;
+ for (int ii = 0; ii < 10; ii++)
+ {
+ printf("Fib(%d) = %d\n", ii, fib(ii));
+ x += fib(ii);
+ }
+
+ return x;
+}
+
+
+int fib(int n)
+{
+ int x = 0, y = 0;
+ if (n < 2)
+ {
+ return n;
+ }
+ else
+ {
+ x = cilk_spawn fib(n-1);
+ y = fib(n-2);
+ cilk_sync;
+ return (x+y);
+ }
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/fib.cpp b/gcc/testsuite/g++.dg/cilk-plus/fib.cpp
deleted file mode 100644
index c119662..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/fib.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//***************************************************************************
-//
-// File: fib.c
-//
-// Created: Tue Oct 26 16:24:01 2010
-//
-// Author: Balaji V. Iyer
-//
-// $Id$
-//
-// Description:$Log$
-//
-//***************************************************************************
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <cilk/cilk.h>
-
-int fib(int );
-
-int main(int argc, char **argv)
-{
- int x = 0;
- for (int ii = 0; ii < 10; ii++)
- {
- printf("Fib(%d) = %d\n", ii, fib(ii));
- x += fib(ii);
- }
-
- return x;
-}
-
-
-int fib(int n)
-{
- int x = 0, y = 0;
- if (n < 2)
- {
- return n;
- }
- else
- {
- x = cilk_spawn fib(n-1);
- y = fib(n-2);
- cilk_sync;
- return (x+y);
- }
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/label_test.cc b/gcc/testsuite/g++.dg/cilk-plus/label_test.cc
new file mode 100644
index 0000000..97f0631
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/label_test.cc
@@ -0,0 +1,20 @@
+#include <stdio.h>
+
+int main(void)
+{
+ int jj = 0;
+
+ _Cilk_for (int ii = 0; ii < 10; ii++)
+ {
+ if ((ii % 2) == 0)
+ goto hello_label;
+ else
+ goto world_label;
+
+hello_label:
+ printf("Hello ");
+world_label:
+ printf("World\n");
+ }
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/label_test.cpp b/gcc/testsuite/g++.dg/cilk-plus/label_test.cpp
deleted file mode 100644
index 97f0631..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/label_test.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdio.h>
-
-int main(void)
-{
- int jj = 0;
-
- _Cilk_for (int ii = 0; ii < 10; ii++)
- {
- if ((ii % 2) == 0)
- goto hello_label;
- else
- goto world_label;
-
-hello_label:
- printf("Hello ");
-world_label:
- printf("World\n");
- }
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/nested-cilk-for.cc b/gcc/testsuite/g++.dg/cilk-plus/nested-cilk-for.cc
new file mode 100644
index 0000000..3a47712
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/nested-cilk-for.cc
@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include <string.h>
+#include <cilk/cilk.h>
+
+
+int main(int argc, char**argv)
+{
+ cilk_for (int ii = 0; ii < 10; ii++) {
+ cilk_for (int jj = 0; jj < 10; jj++) {
+ cilk_for (int kk1 = 0; kk1 < 10; kk1++) {
+ cilk_for (int kk2 = 0; kk2 < 10; kk2++) {
+ cilk_for (int kk3 = 0; kk3 < 10; kk3++) {
+ cilk_for (int kk4 = 0; kk4 < 10; kk4++) {
+ cilk_for (int kk5 = 0; kk5 < 10; kk5++) {
+ cilk_for (int kk6 = 0; kk6 < 10; kk6++) {
+ cilk_for (int kk7 = 0; kk7 < 10; kk7++) {
+ cilk_for (int kk8 = 0; kk8 < 10; kk8++) {
+ cilk_for (int kk9 = 0; kk9 < 10; kk9++) {
+ cilk_for (int kk10 = 0; kk10 < 10; kk10++) {
+ cilk_for (int kk11 = 0; kk11 < 10; kk11++) {
+ printf("Hello World %d!\n",
+ ii+jj+kk1+kk2+kk3+kk4+kk5+kk6+kk7+kk8+kk9+kk10+kk11);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return 0;
+}
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/nested-cilk-for.cpp b/gcc/testsuite/g++.dg/cilk-plus/nested-cilk-for.cpp
deleted file mode 100644
index 3a47712..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/nested-cilk-for.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <cilk/cilk.h>
-
-
-int main(int argc, char**argv)
-{
- cilk_for (int ii = 0; ii < 10; ii++) {
- cilk_for (int jj = 0; jj < 10; jj++) {
- cilk_for (int kk1 = 0; kk1 < 10; kk1++) {
- cilk_for (int kk2 = 0; kk2 < 10; kk2++) {
- cilk_for (int kk3 = 0; kk3 < 10; kk3++) {
- cilk_for (int kk4 = 0; kk4 < 10; kk4++) {
- cilk_for (int kk5 = 0; kk5 < 10; kk5++) {
- cilk_for (int kk6 = 0; kk6 < 10; kk6++) {
- cilk_for (int kk7 = 0; kk7 < 10; kk7++) {
- cilk_for (int kk8 = 0; kk8 < 10; kk8++) {
- cilk_for (int kk9 = 0; kk9 < 10; kk9++) {
- cilk_for (int kk10 = 0; kk10 < 10; kk10++) {
- cilk_for (int kk11 = 0; kk11 < 10; kk11++) {
- printf("Hello World %d!\n",
- ii+jj+kk1+kk2+kk3+kk4+kk5+kk6+kk7+kk8+kk9+kk10+kk11);
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
-
- return 0;
-}
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/plus-equal-one.cc b/gcc/testsuite/g++.dg/cilk-plus/plus-equal-one.cc
new file mode 100644
index 0000000..e47218f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/plus-equal-one.cc
@@ -0,0 +1,57 @@
+#include <cilk/cilk.h>
+#include <iostream>
+#include <cstdio>
+
+using namespace std;
+#define TEST 1
+
+
+#define ITER 300
+
+int n_errors;
+#if TEST
+void test (int *array, int n, int val) {
+ for (int i = 0; i < n; ++i) {
+ if (array[i] != val) {
+ n_errors++;
+ cout << "Value was wrong at " << i << "\t" ;
+ cout << "found " << array[i] << " should be " << val << endl;
+ }
+ }
+}
+#endif
+
+
+int main () {
+ int array[ITER];
+
+ cilk_for (int *j = (array); j < array + ITER; j += 1) {
+ *j = 6;
+// printf("(p = %08x\t*p = %08x)\n", j, *j);
+ }
+#if TEST
+ test(array, ITER, 6);
+#endif
+
+ cilk_for (int *i = array; i < array + ITER; i += 1) {
+ *i = 1;
+ // printf("(p = %08x\t*p = %08x\t)\n", i, *i);
+ }
+
+#if TEST
+ test(array, ITER, 1);
+#endif
+
+ cilk_for (int *i = array+ITER-1; i >= array; i -= 1) {
+ *i = 8;
+ // printf("(p = %08x\t*p = %08x\t)\n", i, *i);
+ }
+#if TEST
+ test(array, ITER, 8);
+#endif
+ cout << "Number of Errors = " << n_errors << endl;
+ cout << "done." << endl;
+
+ return 0;
+
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/plus-equal-one.cpp b/gcc/testsuite/g++.dg/cilk-plus/plus-equal-one.cpp
deleted file mode 100644
index e47218f..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/plus-equal-one.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <cilk/cilk.h>
-#include <iostream>
-#include <cstdio>
-
-using namespace std;
-#define TEST 1
-
-
-#define ITER 300
-
-int n_errors;
-#if TEST
-void test (int *array, int n, int val) {
- for (int i = 0; i < n; ++i) {
- if (array[i] != val) {
- n_errors++;
- cout << "Value was wrong at " << i << "\t" ;
- cout << "found " << array[i] << " should be " << val << endl;
- }
- }
-}
-#endif
-
-
-int main () {
- int array[ITER];
-
- cilk_for (int *j = (array); j < array + ITER; j += 1) {
- *j = 6;
-// printf("(p = %08x\t*p = %08x)\n", j, *j);
- }
-#if TEST
- test(array, ITER, 6);
-#endif
-
- cilk_for (int *i = array; i < array + ITER; i += 1) {
- *i = 1;
- // printf("(p = %08x\t*p = %08x\t)\n", i, *i);
- }
-
-#if TEST
- test(array, ITER, 1);
-#endif
-
- cilk_for (int *i = array+ITER-1; i >= array; i -= 1) {
- *i = 8;
- // printf("(p = %08x\t*p = %08x\t)\n", i, *i);
- }
-#if TEST
- test(array, ITER, 8);
-#endif
- cout << "Number of Errors = " << n_errors << endl;
- cout << "done." << endl;
-
- return 0;
-
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/pragma-simd-for.cc b/gcc/testsuite/g++.dg/cilk-plus/pragma-simd-for.cc
new file mode 100644
index 0000000..3ddf747
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/pragma-simd-for.cc
@@ -0,0 +1,84 @@
+#include <stdio.h>
+#include <stdlib.h>
+void foo(int *p);
+int d[256], g_a[240];
+int some_func(int argc, char**argv)
+{
+int a[256], b[256], c[256], x[256];
+int return_value = 0;
+int i,ii, p=503, v=0,val=0, q=0;
+int r = 5;
+#if 1
+for (ii = 0; ii < 256; ii++)
+{
+ b[ii] = argc * argc;
+ c[ii] = argc + argc;
+ d[ii] = argc + argc;
+}
+#endif
+#if 1
+#pragma simd assert vectorlength(8, 4, 2) private(p,q)
+for (i=0; i<256; i++) {
+ p = i+argc;
+ q = i+argc*argc;
+ a[i] = b[i] + c[i];
+ d[i] = p;
+ g_a[i] = q;
+}
+#endif
+
+#if 1
+#pragma simd private(r)
+for (i=0; i<256; i++) {
+ r = i + q;
+ d[i] = a[i-1];
+ x[i] = r;
+ a[i] = b[i] + c[i];
+}
+#endif
+#if 1
+ foo(a);
+#endif
+#if 1
+ for (ii = 0; ii < 240; ii++)
+ {
+ printf("%d\n", g_a[ii]);
+ }
+#endif
+#if 1
+#pragma simd reduction(+:v)
+ for (ii = 0; ii < 240; ii++)
+ {
+ v += (a[ii] - b[ii]) ;
+ }
+#endif
+ return_value = (a[rand()%256] & v);
+
+
+
+return return_value;
+}
+#if 1
+void foo(int *p)
+{
+int i;
+#pragma simd assert
+for (i = 0; i < 240; i++) {
+g_a[i] = *(p+1);
+}
+}
+#endif
+
+
+#if 1
+int main(int argc, char **argv)
+{
+ int ii = 0;
+ some_func(argc, argv);
+
+ for (ii = 0; ii < 256; ii++)
+ printf("%d\n", d[ii]);
+
+ return 0;
+}
+#endif
diff --git a/gcc/testsuite/g++.dg/cilk-plus/pragma-simd-for.cpp b/gcc/testsuite/g++.dg/cilk-plus/pragma-simd-for.cpp
deleted file mode 100644
index 3ddf747..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/pragma-simd-for.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-void foo(int *p);
-int d[256], g_a[240];
-int some_func(int argc, char**argv)
-{
-int a[256], b[256], c[256], x[256];
-int return_value = 0;
-int i,ii, p=503, v=0,val=0, q=0;
-int r = 5;
-#if 1
-for (ii = 0; ii < 256; ii++)
-{
- b[ii] = argc * argc;
- c[ii] = argc + argc;
- d[ii] = argc + argc;
-}
-#endif
-#if 1
-#pragma simd assert vectorlength(8, 4, 2) private(p,q)
-for (i=0; i<256; i++) {
- p = i+argc;
- q = i+argc*argc;
- a[i] = b[i] + c[i];
- d[i] = p;
- g_a[i] = q;
-}
-#endif
-
-#if 1
-#pragma simd private(r)
-for (i=0; i<256; i++) {
- r = i + q;
- d[i] = a[i-1];
- x[i] = r;
- a[i] = b[i] + c[i];
-}
-#endif
-#if 1
- foo(a);
-#endif
-#if 1
- for (ii = 0; ii < 240; ii++)
- {
- printf("%d\n", g_a[ii]);
- }
-#endif
-#if 1
-#pragma simd reduction(+:v)
- for (ii = 0; ii < 240; ii++)
- {
- v += (a[ii] - b[ii]) ;
- }
-#endif
- return_value = (a[rand()%256] & v);
-
-
-
-return return_value;
-}
-#if 1
-void foo(int *p)
-{
-int i;
-#pragma simd assert
-for (i = 0; i < 240; i++) {
-g_a[i] = *(p+1);
-}
-}
-#endif
-
-
-#if 1
-int main(int argc, char **argv)
-{
- int ii = 0;
- some_func(argc, argv);
-
- for (ii = 0; ii < 256; ii++)
- printf("%d\n", d[ii]);
-
- return 0;
-}
-#endif
diff --git a/gcc/testsuite/g++.dg/cilk-plus/spawn_ctor_dtor.cc b/gcc/testsuite/g++.dg/cilk-plus/spawn_ctor_dtor.cc
new file mode 100644
index 0000000..f262fa7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/spawn_ctor_dtor.cc
@@ -0,0 +1,55 @@
+#include <iostream>
+
+class some_class
+{
+public:
+ some_class(int y);
+ ~some_class();
+ void print_x();
+ void set_x_of_ii_to_value (int index, int value);
+private:
+ int x[5];
+};
+
+some_class::some_class(int y)
+{
+ cilk_spawn set_x_of_ii_to_value (0, y);
+ cilk_spawn set_x_of_ii_to_value (1, y);
+ cilk_spawn set_x_of_ii_to_value (2, y);
+ cilk_spawn set_x_of_ii_to_value (3, y);
+ cilk_spawn set_x_of_ii_to_value (4, y);
+}
+
+some_class::~some_class()
+{
+ cilk_spawn set_x_of_ii_to_value (0, 0);
+ cilk_spawn set_x_of_ii_to_value (1, 0);
+ cilk_spawn set_x_of_ii_to_value (2, 0);
+ cilk_spawn set_x_of_ii_to_value (3, 0);
+ cilk_spawn set_x_of_ii_to_value (4, 0);
+}
+
+void
+some_class::set_x_of_ii_to_value (int index, int value)
+{
+ x[index] = value;
+}
+
+void
+some_class::print_x(void)
+{
+ for (int ii = 0; ii < 5; ii++)
+ {
+ std::cout << "x[" << ii << "] = " << x[ii] << std::endl;
+ }
+ return;
+}
+
+int main(int argc, char **argv)
+{
+ some_class sc(523 + argc);
+
+ sc.print_x();
+
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/spawn_inside_ctor_dtor.cpp b/gcc/testsuite/g++.dg/cilk-plus/spawn_inside_ctor_dtor.cpp
deleted file mode 100644
index f262fa7..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/spawn_inside_ctor_dtor.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <iostream>
-
-class some_class
-{
-public:
- some_class(int y);
- ~some_class();
- void print_x();
- void set_x_of_ii_to_value (int index, int value);
-private:
- int x[5];
-};
-
-some_class::some_class(int y)
-{
- cilk_spawn set_x_of_ii_to_value (0, y);
- cilk_spawn set_x_of_ii_to_value (1, y);
- cilk_spawn set_x_of_ii_to_value (2, y);
- cilk_spawn set_x_of_ii_to_value (3, y);
- cilk_spawn set_x_of_ii_to_value (4, y);
-}
-
-some_class::~some_class()
-{
- cilk_spawn set_x_of_ii_to_value (0, 0);
- cilk_spawn set_x_of_ii_to_value (1, 0);
- cilk_spawn set_x_of_ii_to_value (2, 0);
- cilk_spawn set_x_of_ii_to_value (3, 0);
- cilk_spawn set_x_of_ii_to_value (4, 0);
-}
-
-void
-some_class::set_x_of_ii_to_value (int index, int value)
-{
- x[index] = value;
-}
-
-void
-some_class::print_x(void)
-{
- for (int ii = 0; ii < 5; ii++)
- {
- std::cout << "x[" << ii << "] = " << x[ii] << std::endl;
- }
- return;
-}
-
-int main(int argc, char **argv)
-{
- some_class sc(523 + argc);
-
- sc.print_x();
-
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/spawnee_inline.cc b/gcc/testsuite/g++.dg/cilk-plus/spawnee_inline.cc
new file mode 100644
index 0000000..1f36716
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/spawnee_inline.cc
@@ -0,0 +1,43 @@
+#include <iostream>
+#include <cstdio>
+#include <cstdlib>
+
+int fib (char *n_char)
+{
+ int n;
+ char n_char_minus_one[20], n_char_minus_two[20];
+ if (n_char)
+ n = atoi (n_char);
+ else
+ n = 10;
+
+ if (n < 2)
+ return n;
+ else
+ {
+ int x, y;
+ sprintf(n_char_minus_one,"%d", n-1);
+ sprintf(n_char_minus_two,"%d", n-2);
+ x = cilk_spawn fib (n_char_minus_one);
+ y = cilk_spawn fib (n_char_minus_two);
+ cilk_sync;
+ return (x+y);
+ }
+}
+int main (int argc, char *argv[])
+{
+ int n, result;
+ if (argc == 2)
+ {
+ result = cilk_spawn fib (argv[1]);
+ cilk_sync;
+ std::cout << "Result = " << result << std::endl;
+ }
+ else
+ {
+ result = cilk_spawn fib(NULL);
+ cilk_sync;
+ std::cout << "Result = " << result << std::endl;
+ }
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/spawnee_inline.cpp b/gcc/testsuite/g++.dg/cilk-plus/spawnee_inline.cpp
deleted file mode 100644
index 1f36716..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/spawnee_inline.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <iostream>
-#include <cstdio>
-#include <cstdlib>
-
-int fib (char *n_char)
-{
- int n;
- char n_char_minus_one[20], n_char_minus_two[20];
- if (n_char)
- n = atoi (n_char);
- else
- n = 10;
-
- if (n < 2)
- return n;
- else
- {
- int x, y;
- sprintf(n_char_minus_one,"%d", n-1);
- sprintf(n_char_minus_two,"%d", n-2);
- x = cilk_spawn fib (n_char_minus_one);
- y = cilk_spawn fib (n_char_minus_two);
- cilk_sync;
- return (x+y);
- }
-}
-int main (int argc, char *argv[])
-{
- int n, result;
- if (argc == 2)
- {
- result = cilk_spawn fib (argv[1]);
- cilk_sync;
- std::cout << "Result = " << result << std::endl;
- }
- else
- {
- result = cilk_spawn fib(NULL);
- cilk_sync;
- std::cout << "Result = " << result << std::endl;
- }
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/spawner_inline.cc b/gcc/testsuite/g++.dg/cilk-plus/spawner_inline.cc
new file mode 100644
index 0000000..07044e7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/spawner_inline.cc
@@ -0,0 +1,32 @@
+#include <iostream>
+#include <cstdlib>
+
+
+int fib (int n)
+{
+ if (n < 2)
+ return n;
+ else
+ {
+ int x, y;
+ x = cilk_spawn fib (n-1);
+ y = cilk_spawn fib (n-2);
+ cilk_sync;
+ return (x+y);
+ return 5;
+ }
+}
+
+int main (int argc, char *argv[])
+{
+ int n, result;
+
+ if (argc == 2)
+ n = atoi(argv[1]);
+ else
+ n = 10;
+ result = cilk_spawn fib(n);
+ cilk_sync;
+ std::cout << "Result = " << result << std::endl;
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/spawner_inline.cpp b/gcc/testsuite/g++.dg/cilk-plus/spawner_inline.cpp
deleted file mode 100644
index 07044e7..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/spawner_inline.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <iostream>
-#include <cstdlib>
-
-
-int fib (int n)
-{
- if (n < 2)
- return n;
- else
- {
- int x, y;
- x = cilk_spawn fib (n-1);
- y = cilk_spawn fib (n-2);
- cilk_sync;
- return (x+y);
- return 5;
- }
-}
-
-int main (int argc, char *argv[])
-{
- int n, result;
-
- if (argc == 2)
- n = atoi(argv[1]);
- else
- n = 10;
- result = cilk_spawn fib(n);
- cilk_sync;
- std::cout << "Result = " << result << std::endl;
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/stl_iter.cc b/gcc/testsuite/g++.dg/cilk-plus/stl_iter.cc
new file mode 100644
index 0000000..b85b641
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/stl_iter.cc
@@ -0,0 +1,49 @@
+#include <vector>
+#include <cstdio>
+#include <iostream>
+#include <algorithm>
+#include <cilk/cilk.h>
+using namespace std;
+
+
+int main(void)
+{
+vector <int> array;
+
+#if 1
+for (int ii = -1; ii < 10; ii++)
+{
+ array.push_back(ii);
+}
+#endif
+cilk_for (vector<int>::iterator iter = array.begin(); iter != array.end();
+ iter++)
+{
+ printf("%d\n", *iter);
+ if (*iter == 6)
+ {
+ *iter = 13;
+ }
+}
+cout << "Changed the number 6 to 13 " << endl;
+cilk_for (vector<int>::iterator iter = array.begin(); iter != array.end();
+ iter += 1)
+{
+ printf("%d\n", *iter);
+ if (*iter == 7)
+ *iter = 15;
+}
+
+sort (array.begin(), array.end());
+
+cout << "Changed the number 7 to 15, and array is sorted " << endl;
+cilk_for (vector<int>::iterator iter3 = array.begin(); iter3 != array.end();
+ iter3++)
+{
+ printf("%d\n", *iter3);
+}
+
+return 0;
+}
+
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/stl_rev_iter.cc b/gcc/testsuite/g++.dg/cilk-plus/stl_rev_iter.cc
new file mode 100644
index 0000000..c881211
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/stl_rev_iter.cc
@@ -0,0 +1,51 @@
+#include <vector>
+#include <cstdio>
+#include <iostream>
+#include <algorithm>
+#include <cilk/cilk.h>
+using namespace std;
+
+
+int main(void)
+{
+vector <int> array;
+
+#if 1
+for (int ii = -1; ii < 10; ii++)
+{
+ array.push_back(ii);
+}
+#endif
+cout << "Printing the array backwards " << endl;
+cilk_for (vector<int>::reverse_iterator iter4 = array.rbegin(); iter4 != array.rend();
+ iter4++)
+{
+ printf("%d\n", *iter4);
+ if (*iter4 == 0x8) {
+ *iter4 = 9;
+ }
+}
+
+cout << "Replaced all the 8 with 9 and reprinting the array backwards " << endl;
+cilk_for (vector<int>::reverse_iterator iter2 = array.rbegin(); iter2 != array.rend();
+ iter2 += 1)
+{
+ printf("%d\n", *iter2);
+ if ((*iter2 == 0x4) || (*iter2 == 0x7)) {
+ *iter2 = 0x3;
+ }
+}
+sort (array.begin(), array.end());
+
+cout << "Replaced all 4, 7 with 3 and reprinting the sorted array backwards "
+ << endl;
+cilk_for (vector<int>::reverse_iterator iter2 = array.rbegin(); iter2 != array.rend();
+ ++iter2)
+{
+ printf("%d\n", *iter2);
+}
+
+return 0;
+}
+
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/stl_test-iterators.cpp b/gcc/testsuite/g++.dg/cilk-plus/stl_test-iterators.cpp
deleted file mode 100644
index b85b641..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/stl_test-iterators.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <vector>
-#include <cstdio>
-#include <iostream>
-#include <algorithm>
-#include <cilk/cilk.h>
-using namespace std;
-
-
-int main(void)
-{
-vector <int> array;
-
-#if 1
-for (int ii = -1; ii < 10; ii++)
-{
- array.push_back(ii);
-}
-#endif
-cilk_for (vector<int>::iterator iter = array.begin(); iter != array.end();
- iter++)
-{
- printf("%d\n", *iter);
- if (*iter == 6)
- {
- *iter = 13;
- }
-}
-cout << "Changed the number 6 to 13 " << endl;
-cilk_for (vector<int>::iterator iter = array.begin(); iter != array.end();
- iter += 1)
-{
- printf("%d\n", *iter);
- if (*iter == 7)
- *iter = 15;
-}
-
-sort (array.begin(), array.end());
-
-cout << "Changed the number 7 to 15, and array is sorted " << endl;
-cilk_for (vector<int>::iterator iter3 = array.begin(); iter3 != array.end();
- iter3++)
-{
- printf("%d\n", *iter3);
-}
-
-return 0;
-}
-
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/stl_test-rev-iterators.cpp b/gcc/testsuite/g++.dg/cilk-plus/stl_test-rev-iterators.cpp
deleted file mode 100644
index c881211..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/stl_test-rev-iterators.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <vector>
-#include <cstdio>
-#include <iostream>
-#include <algorithm>
-#include <cilk/cilk.h>
-using namespace std;
-
-
-int main(void)
-{
-vector <int> array;
-
-#if 1
-for (int ii = -1; ii < 10; ii++)
-{
- array.push_back(ii);
-}
-#endif
-cout << "Printing the array backwards " << endl;
-cilk_for (vector<int>::reverse_iterator iter4 = array.rbegin(); iter4 != array.rend();
- iter4++)
-{
- printf("%d\n", *iter4);
- if (*iter4 == 0x8) {
- *iter4 = 9;
- }
-}
-
-cout << "Replaced all the 8 with 9 and reprinting the array backwards " << endl;
-cilk_for (vector<int>::reverse_iterator iter2 = array.rbegin(); iter2 != array.rend();
- iter2 += 1)
-{
- printf("%d\n", *iter2);
- if ((*iter2 == 0x4) || (*iter2 == 0x7)) {
- *iter2 = 0x3;
- }
-}
-sort (array.begin(), array.end());
-
-cout << "Replaced all 4, 7 with 3 and reprinting the sorted array backwards "
- << endl;
-cilk_for (vector<int>::reverse_iterator iter2 = array.rbegin(); iter2 != array.rend();
- ++iter2)
-{
- printf("%d\n", *iter2);
-}
-
-return 0;
-}
-
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/stl_test.cc b/gcc/testsuite/g++.dg/cilk-plus/stl_test.cc
new file mode 100644
index 0000000..2ce0f76
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/stl_test.cc
@@ -0,0 +1,55 @@
+//***************************************************************************
+//
+// File: stl_test.cpp
+//
+// Created: Thu Apr 28 15:04:45 2011
+//
+// Author: Balaji V. Iyer
+//
+// $Id$
+//
+// Description:
+//
+//***************************************************************************
+
+#include <iostream>
+#include <cstdio>
+#include <cstdlib>
+#include <vector>
+#include <algorithm>
+#include <list>
+
+
+using namespace std;
+
+
+int main(int argc, char **argv)
+{
+ vector <int> number_list;
+ int new_number = 0;
+ int no_elements = 0;
+
+ if (argc != 2)
+ {
+ printf("Usage: %s <Number Of Elements in List>\n",argv[0]);
+ return -1;
+ }
+
+ no_elements = atoi(argv[1]);
+
+ number_list.clear();
+ for (int ii = 0; ii < no_elements; ii++)
+ {
+ number_list.push_back(new_number);
+ }
+
+ cilk_for (int jj = 0; jj < no_elements; jj++)
+ {
+ number_list[jj] = jj + no_elements;
+ }
+
+ for (int kk = 0; kk <number_list.size(); kk++)
+ cout << "number_list[" << kk <<"] = " << number_list[kk] << endl;
+
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/stl_test.cpp b/gcc/testsuite/g++.dg/cilk-plus/stl_test.cpp
deleted file mode 100644
index 2ce0f76..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/stl_test.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//***************************************************************************
-//
-// File: stl_test.cpp
-//
-// Created: Thu Apr 28 15:04:45 2011
-//
-// Author: Balaji V. Iyer
-//
-// $Id$
-//
-// Description:
-//
-//***************************************************************************
-
-#include <iostream>
-#include <cstdio>
-#include <cstdlib>
-#include <vector>
-#include <algorithm>
-#include <list>
-
-
-using namespace std;
-
-
-int main(int argc, char **argv)
-{
- vector <int> number_list;
- int new_number = 0;
- int no_elements = 0;
-
- if (argc != 2)
- {
- printf("Usage: %s <Number Of Elements in List>\n",argv[0]);
- return -1;
- }
-
- no_elements = atoi(argv[1]);
-
- number_list.clear();
- for (int ii = 0; ii < no_elements; ii++)
- {
- number_list.push_back(new_number);
- }
-
- cilk_for (int jj = 0; jj < no_elements; jj++)
- {
- number_list[jj] = jj + no_elements;
- }
-
- for (int kk = 0; kk <number_list.size(); kk++)
- cout << "number_list[" << kk <<"] = " << number_list[kk] << endl;
-
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/template_cilk_for_plus_equal.cpp b/gcc/testsuite/g++.dg/cilk-plus/template_cilk_for_plus_equal.cpp
deleted file mode 100644
index 66fcf8b..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/template_cilk_for_plus_equal.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <iostream>
-#include <cilk/cilk.h>
-#include <cstdlib>
-
-template <typename T>
-void some_func(char *number)
-{
- /* this shouldn't output an error */
- cilk_for (T i = 0; i < atoi (number); i += 1)
- std::cout << "Test += " << std::endl;
-
- cilk_for (T j = atoi(number); j > 0 ; j -= 1)
- std::cout << "Test -=" << std::endl;
-
- cilk_for (T k = 0; k < atoi (number); k++)
- std::cout << "Test ++" << std::endl;
-
- cilk_for (T kk = atoi (number); kk > 0; kk--)
- std::cout << "Test --" << std::endl;
-
- std::cout << std::endl;
- return;
-}
-
-int main(int argc, char **argv)
-{
- if (argc == 1)
- return -1;
-
- some_func<int>(argv[1]);
- some_func<char>(argv[1]);
- some_func<long>(argv[1]);
- some_func<unsigned char>(argv[1]);
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/test__cilk.cc b/gcc/testsuite/g++.dg/cilk-plus/test__cilk.cc
new file mode 100644
index 0000000..982ed2d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/test__cilk.cc
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main (void)
+{
+ printf ("__cilk = %d\n", __cilk);
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/test__cilk.cpp b/gcc/testsuite/g++.dg/cilk-plus/test__cilk.cpp
deleted file mode 100644
index 982ed2d..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/test__cilk.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int main (void)
-{
- printf ("__cilk = %d\n", __cilk);
- return 0;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/test_goto.cc b/gcc/testsuite/g++.dg/cilk-plus/test_goto.cc
new file mode 100644
index 0000000..f2527d1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/test_goto.cc
@@ -0,0 +1,9 @@
+int main(int argc, char **argv)
+{
+ int x = 0;
+ if (argc == 1)
+ goto bye;
+ x = 5;
+bye:
+ return x;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/test_goto.cpp b/gcc/testsuite/g++.dg/cilk-plus/test_goto.cpp
deleted file mode 100644
index f2527d1..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/test_goto.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-int main(int argc, char **argv)
-{
- int x = 0;
- if (argc == 1)
- goto bye;
- x = 5;
-bye:
- return x;
-}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/test_rts_foo.cc b/gcc/testsuite/g++.dg/cilk-plus/test_rts_foo.cc
new file mode 100644
index 0000000..a489a7a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/test_rts_foo.cc
@@ -0,0 +1,23 @@
+#include <stdio.h>
+
+extern "C" {
+ void __cilkrts_foo();
+ void __cilkrts_enter_frame (struct __cilkrts_stack_frame *sf);
+ void __cilkrts_enter_frame (struct __cilkrts_stack_frame *sf) {
+ return;
+ }
+}
+
+void __cilkrts_foo()
+{
+ printf("Hello World.\n");
+}
+
+int main (void)
+{
+ __cilkrts_foo();
+
+ return 0;
+}
+
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/test_rts_foo.cpp b/gcc/testsuite/g++.dg/cilk-plus/test_rts_foo.cpp
deleted file mode 100644
index a489a7a..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/test_rts_foo.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-extern "C" {
- void __cilkrts_foo();
- void __cilkrts_enter_frame (struct __cilkrts_stack_frame *sf);
- void __cilkrts_enter_frame (struct __cilkrts_stack_frame *sf) {
- return;
- }
-}
-
-void __cilkrts_foo()
-{
- printf("Hello World.\n");
-}
-
-int main (void)
-{
- __cilkrts_foo();
-
- return 0;
-}
-
-
diff --git a/gcc/testsuite/g++.dg/cilk-plus/tplt_plus_equal.cc b/gcc/testsuite/g++.dg/cilk-plus/tplt_plus_equal.cc
new file mode 100644
index 0000000..66fcf8b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/tplt_plus_equal.cc
@@ -0,0 +1,35 @@
+#include <iostream>
+#include <cilk/cilk.h>
+#include <cstdlib>
+
+template <typename T>
+void some_func(char *number)
+{
+ /* this shouldn't output an error */
+ cilk_for (T i = 0; i < atoi (number); i += 1)
+ std::cout << "Test += " << std::endl;
+
+ cilk_for (T j = atoi(number); j > 0 ; j -= 1)
+ std::cout << "Test -=" << std::endl;
+
+ cilk_for (T k = 0; k < atoi (number); k++)
+ std::cout << "Test ++" << std::endl;
+
+ cilk_for (T kk = atoi (number); kk > 0; kk--)
+ std::cout << "Test --" << std::endl;
+
+ std::cout << std::endl;
+ return;
+}
+
+int main(int argc, char **argv)
+{
+ if (argc == 1)
+ return -1;
+
+ some_func<int>(argv[1]);
+ some_func<char>(argv[1]);
+ some_func<long>(argv[1]);
+ some_func<unsigned char>(argv[1]);
+ return 0;
+}
diff --git a/gcc/testsuite/g++.dg/cilk-plus/varargs_test.cc b/gcc/testsuite/g++.dg/cilk-plus/varargs_test.cc
new file mode 100644
index 0000000..7536c65
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/varargs_test.cc
@@ -0,0 +1,59 @@
+//***************************************************************************
+//
+// File: varargs_test.cpp
+//
+// Created: Thu Apr 21 14:15:23 2011
+//
+// Author: Balaji V. Iyer
+//
+// $Id$
+//
+// Description:
+//
+//***************************************************************************
+
+#include <iostream>
+#include <cstdio>
+#include <cstdarg>
+#include <cstdlib>
+#include <vector>
+#include <algorithm>
+#include <list>
+
+using namespace std;
+
+double compute_total (int no_elements, ...);
+
+int main(int argc, char **argv)
+{
+ double array[5] = {5.0, 4.0, 9.0, 3.0, 4.0};
+ double array2[5] = {5.0, 6.0, 8.0, 6.0};
+ double yy=0, xx=0;
+ yy = _Cilk_spawn compute_total(5,array[0],array[1],array[2],
+ array[3], array[4]);
+ xx= compute_total(4,array2[0],array2[1],array2[2], array2[3]);
+
+ _Cilk_sync;
+
+ printf("Sum of XX & YY(Should be 50) = %lf\n", xx+yy);
+
+ return 0;
+
+}
+
+
+double compute_total (int no_elements, ...)
+{
+ double total = 0;
+ va_list args;
+ va_start(args, no_elements);
+
+ for (int ii = 0; ii < no_elements; ii++)
+ {
+ total += va_arg(args,double);
+ }
+ va_end(args);
+
+ return total;
+}
+
diff --git a/gcc/testsuite/g++.dg/cilk-plus/varargs_test.cpp b/gcc/testsuite/g++.dg/cilk-plus/varargs_test.cpp
deleted file mode 100644
index 7536c65..0000000
--- a/gcc/testsuite/g++.dg/cilk-plus/varargs_test.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//***************************************************************************
-//
-// File: varargs_test.cpp
-//
-// Created: Thu Apr 21 14:15:23 2011
-//
-// Author: Balaji V. Iyer
-//
-// $Id$
-//
-// Description:
-//
-//***************************************************************************
-
-#include <iostream>
-#include <cstdio>
-#include <cstdarg>
-#include <cstdlib>
-#include <vector>
-#include <algorithm>
-#include <list>
-
-using namespace std;
-
-double compute_total (int no_elements, ...);
-
-int main(int argc, char **argv)
-{
- double array[5] = {5.0, 4.0, 9.0, 3.0, 4.0};
- double array2[5] = {5.0, 6.0, 8.0, 6.0};
- double yy=0, xx=0;
- yy = _Cilk_spawn compute_total(5,array[0],array[1],array[2],
- array[3], array[4]);
- xx= compute_total(4,array2[0],array2[1],array2[2], array2[3]);
-
- _Cilk_sync;
-
- printf("Sum of XX & YY(Should be 50) = %lf\n", xx+yy);
-
- return 0;
-
-}
-
-
-double compute_total (int no_elements, ...)
-{
- double total = 0;
- va_list args;
- va_start(args, no_elements);
-
- for (int ii = 0; ii < no_elements; ii++)
- {
- total += va_arg(args,double);
- }
- va_end(args);
-
- return total;
-}
-
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Patch][Cilkplus] Change C++ testsuite extensions from CPP to CC
2011-09-21 19:22 [Patch][Cilkplus] Change C++ testsuite extensions from CPP to CC Iyer, Balaji V
@ 2011-09-23 17:45 ` H.J. Lu
0 siblings, 0 replies; 2+ messages in thread
From: H.J. Lu @ 2011-09-23 17:45 UTC (permalink / raw)
To: Iyer, Balaji V; +Cc: gcc-patches
On Wed, Sep 21, 2011 at 11:51 AM, Iyer, Balaji V
<balaji.v.iyer@intel.com> wrote:
> Hello Everyone,
> This patch is for the Cilkplus branch.This patch will change the cilk-plus testsuite file extensions from ".cpp" to ".cc". In addition, some of the long filenames are shortened. The script file is also modified to reflect this change.
>
> Thanks,
>
I checked it in.
--
H.J.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-23 16:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-21 19:22 [Patch][Cilkplus] Change C++ testsuite extensions from CPP to CC Iyer, Balaji V
2011-09-23 17:45 ` H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).