tag:old.nabble.com,2006:forum-14116
Nabble - Mercury
2009-11-30T01:39:04Z
Mercury is a new logic/functional programming language, which combines the clarity and expressiveness of declarative programming with advanced static analysis and error detection features. Mercury home is <a href="http://www.cs.mu.oz.au/research/mercury/" target="_top" rel="nofollow">here</a>.
tag:old.nabble.com,2006:post-26571746
Re: for review: update web site for gcc 4
2009-11-30T01:39:04Z
2009-11-30T01:39:04Z
Julien Fischer-2
<br>On Mon, 30 Nov 2009, Paul Bone wrote:
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> On Mon, Nov 30, 2009 at 02:38:45PM +1100, Ian MacLarty wrote:
<br>>> On Mon, Nov 30, 2009 at 2:01 PM, Peter Wang <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26571746&i=0" target="_top" rel="nofollow">novalazy@...</a>> wrote:
<br>>>> On 2009-11-30, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26571746&i=1" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>>>>> On Mon, Nov 30, 2009 at 12:32:43PM +1100, Peter Wang wrote:
<br>>>>>> Branches: main
<br>>>>>>
<br>>>>>> news/newsdb.inc:
<br>>>>>> Announce gcc 4 support.
<br>>>>>>
<br>>>>>> download/include/rotd.inc:
<br>>>>>> Update list of working compilers.
<br>>>>>>
<br>>>>>> Add Mac OS X to list of working OSes.
<br>>>>>
<br>>>>> What about the issues with Boehm GC with the most recent OS X? Have we fixed
<br>>>>> that?
<br>>>>
<br>>>> Don't think so, but hlc.gc seems to work at least.
<br>>>>
<br>>>
<br>>> Not sure which Boegm GC issue is being refered to, but there was an
<br>>> issue to do with an undefined macro which prevented Mercury from
<br>>> working on Snow Leopard at all. That issue has been fixed, so Snow
<br>>> Leopard can now run programs compiled in the none.gc and hlc.gc
<br>>> grades.
<br>>>
<br>>
<br>> Ok,
<br>>
<br>> I seem to recall there being an issue that the Sydney/Canberra G12 people
<br>> stumbled apon. Julian has probably fixed it.
</div></div>Actually, Ian fixed it - the fix was the pass -m32 to gcc and a couple
<br>of minor edits to one of the header files.
<br><br>Julien.<p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26571733
Re: for review: update web site for gcc 4
2009-11-30T01:37:19Z
2009-11-30T01:37:19Z
Julien Fischer-2
<br>On Mon, 30 Nov 2009, Ian MacLarty wrote:
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> On Mon, Nov 30, 2009 at 2:01 PM, Peter Wang <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26571733&i=0" target="_top" rel="nofollow">novalazy@...</a>> wrote:
<br>>> On 2009-11-30, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26571733&i=1" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>>>> On Mon, Nov 30, 2009 at 12:32:43PM +1100, Peter Wang wrote:
<br>>>>> Branches: main
<br>>>>>
<br>>>>> news/newsdb.inc:
<br>>>>> Announce gcc 4 support.
<br>>>>>
<br>>>>> download/include/rotd.inc:
<br>>>>> Update list of working compilers.
<br>>>>>
<br>>>>> Add Mac OS X to list of working OSes.
<br>>>>
<br>>>> What about the issues with Boehm GC with the most recent OS X? Have we fixed
<br>>>> that?
<br>>>
<br>>> Don't think so, but hlc.gc seems to work at least.
<br>>>
<br>>
<br>> Not sure which Boegm GC issue is being refered to, but there was an
<br>> issue to do with an undefined macro which prevented Mercury from
<br>> working on Snow Leopard at all. That issue has been fixed, so Snow
<br>> Leopard can now run programs compiled in the none.gc and hlc.gc
<br>> grades.
</div></div>IIRC, the verison of Boehm GC we have doesn't compile with the 64-bit
<br>variant of OS X (which happens to be the default on Snow Leopard.).
<br><br>Julien.<p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26569484
Re: A diff of adding a new option for RBMM
2009-11-29T20:31:36Z
2009-11-29T20:31:36Z
Ralph Becket-2
Zoltan Somogyi, Monday, 30 November 2009:
<br>> On 29-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569484&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> > Good luck with the completion of your Phd!
<br>>
<br>> Quan got his PhD last monday.
<br><br>Well done!
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569484&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569484&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569484&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26569229
Re: for review: update web site for gcc 4
2009-11-29T19:44:08Z
2009-11-29T19:44:08Z
Paul Bone
On Mon, Nov 30, 2009 at 02:38:45PM +1100, Ian MacLarty wrote:
<div class='shrinkable-quote'><div class='shrinkable-quote'><br>> On Mon, Nov 30, 2009 at 2:01 PM, Peter Wang <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569229&i=0" target="_top" rel="nofollow">novalazy@...</a>> wrote:
<br>> > On 2009-11-30, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569229&i=1" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> >> On Mon, Nov 30, 2009 at 12:32:43PM +1100, Peter Wang wrote:
<br>> >> > Branches: main
<br>> >> >
<br>> >> > news/newsdb.inc:
<br>> >> > Announce gcc 4 support.
<br>> >> >
<br>> >> > download/include/rotd.inc:
<br>> >> > Update list of working compilers.
<br>> >> >
<br>> >> > Add Mac OS X to list of working OSes.
<br>> >>
<br>> >> What about the issues with Boehm GC with the most recent OS X? Have we fixed
<br>> >> that?
<br>> >
<br>> > Don't think so, but hlc.gc seems to work at least.
<br>> >
<br>>
<br>> Not sure which Boegm GC issue is being refered to, but there was an
<br>> issue to do with an undefined macro which prevented Mercury from
<br>> working on Snow Leopard at all. That issue has been fixed, so Snow
<br>> Leopard can now run programs compiled in the none.gc and hlc.gc
<br>> grades.
<br>>
</div></div>Ok,
<br><br>I seem to recall there being an issue that the Sydney/Canberra G12 people
<br>stumbled apon. Julian has probably fixed it.
<br><br>My concerns regarding this have been satisfied, go ahead and commit it.
<br><br>Thanks.
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26569229/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26569175
Re: for review: update web site for gcc 4
2009-11-29T19:38:45Z
2009-11-29T19:38:45Z
Ian MacLarty-4
On Mon, Nov 30, 2009 at 2:01 PM, Peter Wang <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569175&i=0" target="_top" rel="nofollow">novalazy@...</a>> wrote:
<div class='shrinkable-quote'><br>> On 2009-11-30, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569175&i=1" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>>> On Mon, Nov 30, 2009 at 12:32:43PM +1100, Peter Wang wrote:
<br>>> > Branches: main
<br>>> >
<br>>> > news/newsdb.inc:
<br>>> > Announce gcc 4 support.
<br>>> >
<br>>> > download/include/rotd.inc:
<br>>> > Update list of working compilers.
<br>>> >
<br>>> > Add Mac OS X to list of working OSes.
<br>>>
<br>>> What about the issues with Boehm GC with the most recent OS X? Have we fixed
<br>>> that?
<br>>
<br>> Don't think so, but hlc.gc seems to work at least.
<br>>
</div><br>Not sure which Boegm GC issue is being refered to, but there was an
<br>issue to do with an undefined macro which prevented Mercury from
<br>working on Snow Leopard at all. That issue has been fixed, so Snow
<br>Leopard can now run programs compiled in the none.gc and hlc.gc
<br>grades.
<br><br>Ian.
<br><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569175&i=2" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569175&i=3" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26569175&i=4" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26568957
Re: for review: update web site for gcc 4
2009-11-29T19:01:01Z
2009-11-29T19:01:01Z
Peter Wang-6
On 2009-11-30, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568957&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<div class='shrinkable-quote'><br>> On Mon, Nov 30, 2009 at 12:32:43PM +1100, Peter Wang wrote:
<br>> > Branches: main
<br>> >
<br>> > news/newsdb.inc:
<br>> > Announce gcc 4 support.
<br>> >
<br>> > download/include/rotd.inc:
<br>> > Update list of working compilers.
<br>> >
<br>> > Add Mac OS X to list of working OSes.
<br>>
<br>> What about the issues with Boehm GC with the most recent OS X? Have we fixed
<br>> that?
</div><br>Don't think so, but hlc.gc seems to work at least.
<br><br>Peter
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568957&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568957&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568957&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26568827
Re: for review: update web site for gcc 4
2009-11-29T18:34:25Z
2009-11-29T18:34:25Z
Ian MacLarty-4
On Mon, Nov 30, 2009 at 12:48 PM, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568827&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<div class='shrinkable-quote'><br>> On Mon, Nov 30, 2009 at 12:32:43PM +1100, Peter Wang wrote:
<br>>> Branches: main
<br>>>
<br>>> news/newsdb.inc:
<br>>> Announce gcc 4 support.
<br>>>
<br>>> download/include/rotd.inc:
<br>>> Update list of working compilers.
<br>>>
<br>>> Add Mac OS X to list of working OSes.
<br>>
<br>> What about the issues with Boehm GC with the most recent OS X? Have we fixed
<br>> that?
<br>>
</div><br>Yes, as far as I know. (It works on my Mac anyway, which is running
<br>Snow Leopard).
<br><br>Ian.
<br><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568827&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568827&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568827&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26568745
Re: for review: update web site for gcc 4
2009-11-29T18:08:54Z
2009-11-29T18:08:54Z
Ian MacLarty-4
On Mon, Nov 30, 2009 at 12:32 PM, Peter Wang <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568745&i=0" target="_top" rel="nofollow">novalazy@...</a>> wrote:
<div class='shrinkable-quote'><br>> Branches: main
<br>>
<br>> news/newsdb.inc:
<br>> Announce gcc 4 support.
<br>>
<br>> download/include/rotd.inc:
<br>> Update list of working compilers.
<br>>
<br>> Add Mac OS X to list of working OSes.
<br>>
</div><br>That looks fine.
<br><br>Ian.
<br><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568745&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568745&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568745&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26568514
Re: for review: update web site for gcc 4
2009-11-29T17:48:09Z
2009-11-29T17:48:09Z
Paul Bone
On Mon, Nov 30, 2009 at 12:32:43PM +1100, Peter Wang wrote:
<br>> Branches: main
<br>>
<br>> news/newsdb.inc:
<br>> Announce gcc 4 support.
<br>>
<br>> download/include/rotd.inc:
<br>> Update list of working compilers.
<br>>
<br>> Add Mac OS X to list of working OSes.
<br><br>What about the issues with Boehm GC with the most recent OS X? Have we fixed
<br>that?
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26568514/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26568421
for review: update web site for gcc 4
2009-11-29T17:32:43Z
2009-11-29T17:32:43Z
Peter Wang-6
Branches: main
<br><br>news/newsdb.inc:
<br> Announce gcc 4 support.
<br><br>download/include/rotd.inc:
<br> Update list of working compilers.
<br><br> Add Mac OS X to list of working OSes.
<br><br>Index: download/include/rotd.inc
<br>===================================================================
<br>RCS file: /home/mercury1/repository/w3/download/include/rotd.inc,v
<br>retrieving revision 1.15
<br>diff -u -p -r1.15 rotd.inc
<br>--- download/include/rotd.inc 1 Oct 2009 07:11:11 -0000 1.15
<br>+++ download/include/rotd.inc 30 Nov 2009 01:30:45 -0000
<br>@@ -80,6 +80,7 @@ tested for every release of the day.
<br> <li> x86 machines running FreeBSD 3.0
<br> <li> x86 machines running other BSD Unix systems
<br> <li> x86 machines running SunOS 5.x
<br>+ <li> x86 machines running Mac OS X
<br> <li> PowerPC machines running Linux
<br> <li> PowerPC machines running Mac OS 10.3 and above
<br> <li> Sun SPARC machines running SunOS 4.x and 5.x
<br>@@ -102,15 +103,13 @@ tested for every release of the day.
<br> <p>
<br> We recommend GCC 3.4.x.
<br> <p>
<br>+ GCC 4.1 - 4.4 also work (on Linux x86/x86-64).
<br>+ <p>
<br> GCC 3.0, 3.3.1 and 4.0 will NOT work.
<br> They have bugs which cause
<br> internal compiler errors when compiling the C code generated by the
<br> Mercury compiler.
<br> <p>
<br>- GCC 4.1 - 4.4 do not work well with the low-level C grades.
<br>- gcc-specific optimisations will be disabled, so performance will
<br>- be much worse than it should be. We are working on it.
<br>- <p>
<br> Avoid GCC 2.96 (distributed with Red Hat Linux 7.x) and
<br> other unofficial releases of GCC. Also avoid versions of GCC less
<br> than GCC 2.95.X.
<br>Index: news/newsdb.inc
<br>===================================================================
<br>RCS file: /home/mercury1/repository/w3/news/newsdb.inc,v
<br>retrieving revision 1.113
<br>diff -u -p -r1.113 newsdb.inc
<br>--- news/newsdb.inc 25 Sep 2009 07:07:41 -0000 1.113
<br>+++ news/newsdb.inc 30 Nov 2009 01:30:45 -0000
<br>@@ -21,6 +21,11 @@
<br> */
<br>
<br> $newsdb = array(
<br>+"30 November 2009" => array("GCC 4.x supprt",
<br>+"You can now use GCC 4.1 - 4.4 to build Mercury programs in
<br>+low-level C grades, on Linux/x86 and Linux/x86-64.
<br>+You will need a release of the day.
<br>+"),
<br>
<br> "25 September 2009" => array("Java backend",
<br> "The Java backend was restored and improved over the last few months.
<br><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568421&i=0" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568421&i=1" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568421&i=2" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26568359
gcc 4.x support
2009-11-29T17:10:19Z
2009-11-29T17:10:19Z
Peter Wang-6
Hi,
<br><br>rotd-2009-11-26 is compatible with gcc 4.1 through 4.4 for asm_fast and
<br>reg grades, on Linux/x86 and Linux/x86-64. Windows is untested.
<br>Mac OS X is still broken for different reasons.
<br><br>As noted, the usual address isn't working so you'll have to go via
<br><a href="http://www.mercury.csse.unimelb.edu.au/" target="_top" rel="nofollow">http://www.mercury.csse.unimelb.edu.au/</a><br><br>Peter
<br>--------------------------------------------------------------------------
<br>mercury-users mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568359&i=0" target="_top" rel="nofollow">mercury-users@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568359&i=1" target="_top" rel="nofollow">owner-mercury-users@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26568359&i=2" target="_top" rel="nofollow">mercury-users-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Users-f14118.html" embed="fixTarget[14118]" target="_top" >Mercury - Users</a></p>
tag:old.nabble.com,2006:post-26565584
Re: for review: Re-factor the MR_join_and_continue macro.
2009-11-29T12:16:00Z
2009-11-29T12:16:00Z
Paul Bone
On Mon, Nov 30, 2009 at 06:14:05AM +1100, Zoltan Somogyi wrote:
<br>> On 27-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26565584&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> > This change passes bootcheck and the test suite in the asm_fast.gc.par grade.
<br>>
<br>> library/thread.semaphore.m:
<br>> Fix bug that prevented the library from compiling in grade hlc.gc.
<br>>
<br><br>Thanks.
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26565584/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26565008
Re: for review: Re-factor the MR_join_and_continue macro.
2009-11-29T11:14:05Z
2009-11-29T11:14:05Z
Zoltan Somogyi-2
On 27-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26565008&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> This change passes bootcheck and the test suite in the asm_fast.gc.par grade.
<br><br>library/thread.semaphore.m:
<br> Fix bug that prevented the library from compiling in grade hlc.gc.
<br><br>Zoltan.
<br><br>cvs diff: Diffing .
<br>Index: thread.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/library/thread.m,v
<br>retrieving revision 1.16
<br>diff -u -b -r1.16 thread.m
<br>--- thread.m 5 Aug 2009 06:08:13 -0000 1.16
<br>+++ thread.m 29 Nov 2009 19:08:29 -0000
<br>@@ -372,7 +372,7 @@
<br> MR_LOCK(&MR_thread_barrier_lock, ""ML_thread_wrapper"");
<br> MR_thread_barrier_count--;
<br> if (MR_thread_barrier_count == 0) {
<br>- MR_SIGNAL(&MR_thread_barrier_cond);
<br>+ MR_SIGNAL(&MR_thread_barrier_cond, ""ML_thread_wrapper"");
<br> }
<br> MR_UNLOCK(&MR_thread_barrier_lock, ""ML_thread_wrapper"");
<br>
<br>Index: thread.semaphore.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/library/thread.semaphore.m,v
<br>retrieving revision 1.17
<br>diff -u -b -r1.17 thread.semaphore.m
<br>--- thread.semaphore.m 5 Aug 2009 06:08:13 -0000 1.17
<br>+++ thread.semaphore.m 29 Nov 2009 19:08:29 -0000
<br>@@ -246,7 +246,7 @@
<br> }
<br> #else
<br> sem->count++;
<br>- MR_SIGNAL(&(sem->cond));
<br>+ MR_SIGNAL(&(sem->cond), ""semaphore.signal"");
<br> MR_UNLOCK(&(sem->lock), ""semaphore__signal"");
<br> #endif
<br> IO = IO0;
<br>@@ -329,7 +329,8 @@
<br> ** return prematurely with the error code EINTR in glibc 2.3.2
<br> ** if the thread is sent a signal.
<br> */
<br>- while (MR_WAIT(&(sem->cond), &(sem->lock)) != 0) {
<br>+ while (MR_WAIT(&(sem->cond), &(sem->lock), ""semaphore.wait"") != 0) {
<br>+ /* do nothing */
<br> }
<br> }
<br>
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26565008&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26565008&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26565008&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26562643
Re: A diff of adding a new option for RBMM
2009-11-29T06:45:22Z
2009-11-29T06:45:22Z
Zoltan Somogyi-2
On 29-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26562643&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> Good luck with the completion of your Phd!
<br><br>Quan got his PhD last monday.
<br><br>Zoltan.
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26562643&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26562643&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26562643&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26557970
Re: A diff of adding a new option for RBMM
2009-11-28T15:23:49Z
2009-11-28T15:23:49Z
Paul Bone
On Sun, Nov 29, 2009 at 10:16:10AM +1100, Zoltan Somogyi wrote:
<div class='shrinkable-quote'><div class='shrinkable-quote'><br>> On 29-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26557970&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> > issue 'cvs add' for files that you're adding as part of this change?
<br>> >
<br>> > I'm getting the following error when I try to build Mercury:
<br>> >
<br>> > make[1]: *** No rule to make target `rbmm.actual_region_arguments.m', needed by `transform_hlds.date0'. Stop.
<br>> > make[1]: *** Waiting for unfinished jobs....
<br>> > make[1]: Leaving directory `/mnt/mercury/taura-workspaces/pbone/par-runtime-profiling/compiler'
<br>> > make: *** [compiler] Error 2
<br>>
<br>> This diff REMOVED rbmm.actual_region_arguments.m. The reason why you are
<br>> getting the error is that you haven't done removed that module's now obsolete
<br>> interface files and done a "mmake depend".
</div></div>Sorry Quan.
<br><br>I was mistaken. I thought I had cleaned it properly but after I found that
<br>using 'cvs up -D' to roll back to a previous version still didn't work that I
<br>misunderstood the problem.
<br><br>Next time I'll test my claim by building a freshly checked-out workspace. :-)
<br>Good luck with the completion of your Phd!
<br><br>Thanks.
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26557970/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26557922
Re: A diff of adding a new option for RBMM
2009-11-28T15:16:10Z
2009-11-28T15:16:10Z
Zoltan Somogyi-2
On 29-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26557922&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> issue 'cvs add' for files that you're adding as part of this change?
<br>>
<br>> I'm getting the following error when I try to build Mercury:
<br>>
<br>> make[1]: *** No rule to make target `rbmm.actual_region_arguments.m', needed by `transform_hlds.date0'. Stop.
<br>> make[1]: *** Waiting for unfinished jobs....
<br>> make[1]: Leaving directory `/mnt/mercury/taura-workspaces/pbone/par-runtime-profiling/compiler'
<br>> make: *** [compiler] Error 2
<br><br>This diff REMOVED rbmm.actual_region_arguments.m. The reason why you are
<br>getting the error is that you haven't done removed that module's now obsolete
<br>interface files and done a "mmake depend".
<br><br>Zoltan.
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26557922&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26557922&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26557922&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26557832
Re: A diff of adding a new option for RBMM
2009-11-28T15:05:21Z
2009-11-28T15:05:21Z
Paul Bone
On Fri, Nov 27, 2009 at 04:50:09PM +0100, Quan Phan wrote:
<br>> Hi,
<br>>
<br>> This diff has been reviewed by Zoltan.
<br>>
<br><br>Hi Quan, I noticed that you've commited this already, but did you remember to
<br>issue 'cvs add' for files that you're adding as part of this change?
<br><br>I'm getting the following error when I try to build Mercury:
<br><br>make[1]: *** No rule to make target `rbmm.actual_region_arguments.m', needed by `transform_hlds.date0'. Stop.
<br>make[1]: *** Waiting for unfinished jobs....
<br>make[1]: Leaving directory `/mnt/mercury/taura-workspaces/pbone/par-runtime-profiling/compiler'
<br>make: *** [compiler] Error 2
<br><br>Thanks.
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26557832/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26544205
A diff of adding a new option for RBMM
2009-11-27T07:50:09Z
2009-11-27T07:50:09Z
Quan Phan
Hi,
<br><br>This diff has been reviewed by Zoltan.
<br><br>Regards,
<br>Quan.
<br><br><br>compiler/options.m:
<br> Add a new option that allows us to distinguish between the rbmm2 and rbmm3
<br> versions of the system in the paper.
<br><br>compiler/rbmm.add_rbmm_goal_infos.m:
<br> Use the new option to decide whether to apply the optimization
<br> that distinguishes rbmm3.
<br><br>compiler/rbmm.points_to_graph.m:
<br> Add a utility predicate needed by the new code in
<br> rbmm.add_rbmm_goal_infos.m.
<br><br>compiler/rbmm.region_arguments.m:
<br> A new module that replaces rbmm.actual_region_arguments.m. It computes
<br> the regions in one place, not in several.
<br><br>compiler/rbmm.actual_region_arguments.m:
<br> Remove this replaced module.
<br><br>compiler/rbmm.m:
<br> Replace the old module with the new one.
<br><br>compiler/rbmm.points_to_analysis.m:
<br> Apply rule T6 from my thesis.
<br><br>compiler/rbmm.points_to_info.m:
<br> Add meaningful names to some types.
<br><br>compiler/rbmm.interproc_region_lifetime.m:
<br> Use the new type name.
<br><br>compiler/rbmm.region_transformation.m:
<br> Use the new type name, and use the new data structure representing
<br> procedure arguments.
<br><br>cvs diff: Diffing .
<br>Index: options.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/options.m,v
<br>retrieving revision 1.660
<br>diff -u -r1.660 options.m
<br>--- options.m 30 Oct 2009 03:33:17 -0000 1.660
<br>+++ options.m 28 Nov 2009 01:52:05 -0000
<br>@@ -372,6 +372,7 @@
<br> ; extend_stacks_when_needed
<br> ; stack_segments
<br> ; use_regions
<br>+ ; use_alloc_regions
<br> ; use_regions_debug
<br> ; use_regions_profiling
<br> ; source_to_source_debug
<br>@@ -1247,6 +1248,7 @@
<br> extend_stacks_when_needed - bool(no),
<br> stack_segments - bool(no),
<br> use_regions - bool(no),
<br>+ use_alloc_regions - bool(yes),
<br> use_regions_debug - bool(no),
<br> use_regions_profiling - bool(no),
<br> use_minimal_model_stack_copy - bool(no),
<br>@@ -2112,6 +2114,7 @@
<br> long_option("extend-stacks-when-needed", extend_stacks_when_needed).
<br> long_option("stack-segments", stack_segments).
<br> long_option("use-regions", use_regions).
<br>+long_option("use-alloc-regions", use_alloc_regions).
<br> long_option("use-regions-debug", use_regions_debug).
<br> long_option("use-regions-profiling",use_regions_profiling).
<br> % Data representation options
<br>@@ -4201,6 +4204,9 @@
<br> % should also document rbmmd rbmmp rbmmdp
<br> %"--use-regions\t\t(grade modifier: `.rbmm')",
<br> %"\tEnable support for region-based memory managment."
<br>+ %"--use-alloc-regions",
<br>+ %"\tCompute and use the exact set of regions",
<br>+ %"\t that may be allocated into by a call."
<br> ]),
<br>
<br> io.write_string("\n LLDS back-end compilation model options:\n"),
<br>Index: rbmm.actual_region_arguments.m
<br>===================================================================
<br>RCS file: rbmm.actual_region_arguments.m
<br>diff -N rbmm.actual_region_arguments.m
<br>--- rbmm.actual_region_arguments.m 23 Dec 2008 01:37:40 -0000 1.4
<br>+++ /dev/null 1 Jan 1970 00:00:00 -0000
<br>@@ -1,268 +0,0 @@
<br>-% -----------------------------------------------------------------------------%
<br>-% vim: ft=mercury ts=4 sw=4 et
<br>-%-----------------------------------------------------------------------------%
<br>-% Copyright (C) 2007-2008 The University of Melbourne.
<br>-% This file may only be copied under the terms of the GNU General
<br>-% Public License - see the file COPYING in the Mercury distribution.
<br>-%-----------------------------------------------------------------------------%
<br>-%
<br>-% File: rbmm.actual_region_arguments.m.
<br>-% Main author: Quan Phan.
<br>-%
<br>-% We will pass regions as extra arguments in procedure calls. The extra formal
<br>-% region arguments are already known from live region analysis.
<br>-% This module derives the corresponding actual region arguments at call sites
<br>-% in each procedure. This information will be used to extend the argument
<br>-% lists of calls in the HLDS.
<br>-
<br>-%-----------------------------------------------------------------------------%
<br>-%-----------------------------------------------------------------------------%
<br>-
<br>-:- module transform_hlds.rbmm.actual_region_arguments.
<br>-:- interface.
<br>-
<br>-:- import_module hlds.
<br>-:- import_module hlds.hlds_module.
<br>-:- import_module hlds.hlds_pred.
<br>-:- import_module transform_hlds.rbmm.points_to_graph.
<br>-:- import_module transform_hlds.rbmm.points_to_info.
<br>-:- import_module transform_hlds.rbmm.region_liveness_info.
<br>-:- import_module transform_hlds.smm_common.
<br>-
<br>-:- import_module list.
<br>-:- import_module map.
<br>-
<br>-:- type proc_pp_actual_region_args_table
<br>- == map(
<br>- pred_proc_id,
<br>- pp_actual_region_args_table
<br>- ).
<br>-
<br>-:- type pp_actual_region_args_table
<br>- == map(
<br>- program_point,
<br>- actual_region_args
<br>- ).
<br>-
<br>-:- type actual_region_args
<br>- ---> actual_region_args(
<br>- list(rptg_node), % constant (carried) region arguments.
<br>- list(rptg_node), % inputs (removed).
<br>- list(rptg_node) % outputs (created).
<br>- ).
<br>-:- pred record_actual_region_arguments(module_info::in, rpta_info_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_pp_actual_region_args_table::out) is det.
<br>-
<br>-%-----------------------------------------------------------------------------%
<br>-%-----------------------------------------------------------------------------%
<br>-
<br>-:- implementation.
<br>-
<br>-:- import_module check_hlds.
<br>-:- import_module check_hlds.goal_path.
<br>-:- import_module hlds.hlds_goal.
<br>-:- import_module libs.
<br>-:- import_module libs.compiler_util.
<br>-
<br>-:- import_module set.
<br>-:- import_module string.
<br>-:- import_module svmap.
<br>-
<br>-record_actual_region_arguments(ModuleInfo, RptaInfoTable, ConstantRTable,
<br>- DeadRTable, BornRTable, ActualRegionArgTable) :-
<br>- module_info_predids(PredIds, ModuleInfo, _),
<br>- list.foldl(record_actual_region_arguments_pred(ModuleInfo,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>- PredIds, map.init, ActualRegionArgTable).
<br>-
<br>-:- pred record_actual_region_arguments_pred(module_info::in,
<br>- rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in, pred_id::in,
<br>- proc_pp_actual_region_args_table::in,
<br>- proc_pp_actual_region_args_table::out) is det.
<br>-
<br>-record_actual_region_arguments_pred(ModuleInfo, RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable, PredId,
<br>- !ActualRegionArgTable) :-
<br>- module_info_pred_info(ModuleInfo, PredId, PredInfo),
<br>- ProcIds = pred_info_non_imported_procids(PredInfo),
<br>- list.foldl(record_actual_region_arguments_proc(ModuleInfo, PredId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable), ProcIds,
<br>- !ActualRegionArgTable).
<br>-
<br>-:- pred record_actual_region_arguments_proc(module_info::in, pred_id::in,
<br>- rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in, proc_id::in,
<br>- proc_pp_actual_region_args_table::in,
<br>- proc_pp_actual_region_args_table::out) is det.
<br>-
<br>-record_actual_region_arguments_proc(ModuleInfo, PredId, RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable, ProcId,
<br>- !ActualRegionArgTable) :-
<br>- PPId = proc(PredId, ProcId),
<br>- ( if some_are_special_preds([PPId], ModuleInfo)
<br>- then true
<br>- else
<br>- module_info_proc_info(ModuleInfo, PPId, ProcInfo0),
<br>- fill_goal_path_slots(ModuleInfo, ProcInfo0, ProcInfo),
<br>- proc_info_get_goal(ProcInfo, Body),
<br>- record_actual_region_arguments_goal(ModuleInfo, PPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Body,
<br>- map.init, ActualRegionArgProc),
<br>- svmap.set(PPId, ActualRegionArgProc, !ActualRegionArgTable)
<br>- ).
<br>-
<br>-:- pred record_actual_region_arguments_goal(module_info::in,
<br>- pred_proc_id::in, rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in, hlds_goal::in,
<br>- pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>-
<br>-record_actual_region_arguments_goal(ModuleInfo, PPId, RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable, Goal, !ActualRegionArgProc) :-
<br>- Goal = hlds_goal(Expr, Info),
<br>- record_actual_region_arguments_expr(Expr, Info, ModuleInfo, PPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>- !ActualRegionArgProc).
<br>-
<br>-:- pred record_actual_region_arguments_expr(hlds_goal_expr::in,
<br>- hlds_goal_info::in, module_info::in, pred_proc_id::in,
<br>- rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in,
<br>- pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>-
<br>-record_actual_region_arguments_expr(GoalExpr, GoalInfo, ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>- !ActualRegionArgProc) :-
<br>- (
<br>- GoalExpr = plain_call(PredId, ProcId, _, _, _, _),
<br>- CalleePPId = proc(PredId, ProcId),
<br>- ( some_are_special_preds([CalleePPId], ModuleInfo) ->
<br>- true
<br>- ;
<br>- CallSite = program_point_init(GoalInfo),
<br>- record_actual_region_arguments_call_site(CallerPPId, CallSite,
<br>- CalleePPId, RptaInfoTable, ConstantRTable, DeadRTable,
<br>- BornRTable, !ActualRegionArgProc)
<br>- )
<br>- ;
<br>- GoalExpr = conj(_, Conjuncts),
<br>- list.foldl(
<br>- record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>- Conjuncts, !ActualRegionArgProc)
<br>- ;
<br>- GoalExpr = disj(Disjuncts),
<br>- list.foldl(
<br>- record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>- Disjuncts, !ActualRegionArgProc)
<br>- ;
<br>- GoalExpr = if_then_else(_, Cond, Then, Else),
<br>- record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Cond,
<br>- !ActualRegionArgProc),
<br>- record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Then,
<br>- !ActualRegionArgProc),
<br>- record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Else,
<br>- !ActualRegionArgProc)
<br>- ;
<br>- GoalExpr = switch(_, _, Cases),
<br>- list.foldl(
<br>- record_actual_region_arguments_case(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>- Cases, !ActualRegionArgProc)
<br>- ;
<br>- GoalExpr = generic_call(_, _, _, _),
<br>- sorry(this_file,
<br>- "record_actual_region_arguments_expr: generic_call NYI")
<br>- ;
<br>- GoalExpr = call_foreign_proc(_, _, _, _, _, _, _),
<br>- sorry(this_file,
<br>- "record_actual_region_arguments_expr: call_foreign_proc NYI")
<br>- ;
<br>- GoalExpr = negation(SubGoal),
<br>- record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, SubGoal,
<br>- !ActualRegionArgProc)
<br>- ;
<br>- GoalExpr = unify(_, _, _, _, _)
<br>- ;
<br>- GoalExpr = scope(_, SubGoal),
<br>- % XXX We should special-case the handling of from_ground_term_construct
<br>- % scopes.
<br>- record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>- RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, SubGoal,
<br>- !ActualRegionArgProc)
<br>- ;
<br>- GoalExpr = shorthand(_),
<br>- unexpected(this_file,
<br>- "record_actual_region_arguments_expr: shorthand")
<br>- ).
<br>-
<br>-:- pred record_actual_region_arguments_case(module_info::in,
<br>- pred_proc_id::in, rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in, case::in,
<br>- pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>-
<br>-record_actual_region_arguments_case(ModuleInfo, PPId, RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable, Case, !ActualRegionArgProc) :-
<br>- Case = case(_, _, Goal),
<br>- record_actual_region_arguments_goal(ModuleInfo, PPId, RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable, Goal, !ActualRegionArgProc).
<br>-
<br>-:- pred record_actual_region_arguments_call_site(pred_proc_id::in,
<br>- program_point::in, pred_proc_id::in,
<br>- rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in,
<br>- pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>-
<br>-record_actual_region_arguments_call_site(CallerPPId, CallSite,
<br>- CalleePPId, RptaInfoTable, ConstantRTable, DeadRTable,
<br>- BornRTable, !ActualRegionArgProc) :-
<br>- map.lookup(ConstantRTable, CalleePPId, CalleeConstantR),
<br>- map.lookup(DeadRTable, CalleePPId, CalleeDeadR),
<br>- map.lookup(BornRTable, CalleePPId, CalleeBornR),
<br>-
<br>- map.lookup(RptaInfoTable, CallerPPId, CallerRptaInfo),
<br>- CallerRptaInfo = rpta_info(_, CallerAlpha),
<br>- map.lookup(CallerAlpha, CallSite, AlphaAtCallSite),
<br>-
<br>- % Actual constant region arguments.
<br>- set.to_sorted_list(CalleeConstantR, LCalleeConstantR),
<br>- list.foldl(find_actual_param(AlphaAtCallSite), LCalleeConstantR, [],
<br>- LActualConstantR0),
<br>- list.reverse(LActualConstantR0, LActualConstantR),
<br>-
<br>- % Actual dead region arguments.
<br>- set.to_sorted_list(CalleeDeadR, LCalleeDeadR),
<br>- list.foldl(find_actual_param(AlphaAtCallSite), LCalleeDeadR, [],
<br>- LActualDeadR0),
<br>- list.reverse(LActualDeadR0, LActualDeadR),
<br>-
<br>- % Actual born region arguments.
<br>- set.to_sorted_list(CalleeBornR, LCalleeBornR),
<br>- list.foldl(find_actual_param(AlphaAtCallSite), LCalleeBornR, [],
<br>- LActualBornR0),
<br>- list.reverse(LActualBornR0, LActualBornR),
<br>-
<br>- svmap.det_insert(CallSite,
<br>- actual_region_args(LActualConstantR, LActualDeadR, LActualBornR),
<br>- !ActualRegionArgProc).
<br>-
<br>-:- pred find_actual_param(map(rptg_node, rptg_node)::in, rptg_node::in,
<br>- list(rptg_node)::in, list(rptg_node)::out) is det.
<br>-
<br>-find_actual_param(Alpha_PP, Formal, Actuals0, Actuals) :-
<br>- map.lookup(Alpha_PP, Formal, Actual),
<br>- Actuals = [Actual | Actuals0].
<br>-
<br>-%-----------------------------------------------------------------------------%
<br>-
<br>-:- func this_file = string.
<br>-
<br>-this_file = "rbmm.actual_region_arguments.m".
<br>-
<br>-%-----------------------------------------------------------------------------%
<br>Index: rbmm.add_rbmm_goal_infos.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/rbmm.add_rbmm_goal_infos.m,v
<br>retrieving revision 1.8
<br>diff -u -r1.8 rbmm.add_rbmm_goal_infos.m
<br>--- rbmm.add_rbmm_goal_infos.m 2 Sep 2009 00:30:23 -0000 1.8
<br>+++ rbmm.add_rbmm_goal_infos.m 28 Nov 2009 01:52:05 -0000
<br>@@ -41,8 +41,8 @@
<br>
<br> :- import_module hlds.
<br> :- import_module hlds.hlds_module.
<br>-:- import_module transform_hlds.rbmm.actual_region_arguments.
<br> :- import_module transform_hlds.rbmm.points_to_info.
<br>+:- import_module transform_hlds.rbmm.region_arguments.
<br> :- import_module transform_hlds.rbmm.region_resurrection_renaming.
<br> :- import_module transform_hlds.rbmm.region_transformation.
<br>
<br>@@ -63,6 +63,8 @@
<br> :- import_module hlds.hlds_pred.
<br> :- import_module libs.
<br> :- import_module libs.compiler_util.
<br>+:- import_module libs.globals.
<br>+:- import_module libs.options.
<br> :- import_module mdbcomp.
<br> :- import_module mdbcomp.prim_data.
<br> :- import_module parse_tree.
<br>@@ -72,11 +74,12 @@
<br> :- import_module transform_hlds.rbmm.points_to_graph.
<br> :- import_module transform_hlds.smm_common.
<br>
<br>-:- import_module string.
<br>+:- import_module bool.
<br> :- import_module list.
<br> :- import_module map.
<br> :- import_module maybe.
<br> :- import_module set.
<br>+:- import_module string.
<br>
<br> %-----------------------------------------------------------------------------%
<br> %
<br>@@ -163,7 +166,7 @@
<br> collect_rbmm_goal_info_unification(Unification, ModuleInfo, Graph,
<br> ResurRenaming, IteRenaming, NameToRegionVar, !Info).
<br>
<br>-collect_rbmm_goal_info_goal_expr(ModuleInfo, ProcInfo, _,
<br>+collect_rbmm_goal_info_goal_expr(ModuleInfo, ProcInfo, Graph,
<br> ActualRegionArgumentProc, _, _, _, !Expr, !Info) :-
<br> !.Expr = plain_call(PredId, ProcId, Args, _, _, _),
<br> CalleePPId = proc(PredId, ProcId),
<br>@@ -189,7 +192,7 @@
<br> proc_info_get_vartypes(ProcInfo, VarTypes),
<br> RegionArgs = list.filter(is_region_var(VarTypes), Args),
<br> map.lookup(ActualRegionArgumentProc, CallSite, ActualRegionArgs),
<br>- ActualRegionArgs = actual_region_args(Constants, Inputs, _Outputs),
<br>+ ActualRegionArgs = region_args(Constants, Inputs, _Outputs),
<br> list.det_split_list(list.length(Constants), RegionArgs,
<br> CarriedRegions, RemovedAndCreated),
<br> list.det_split_list(list.length(Inputs), RemovedAndCreated,
<br>@@ -198,12 +201,55 @@
<br> % are allocated into and read from in this call.
<br> AllocatedIntoAndReadFrom =
<br> set.from_list(RemovedRegions ++ CarriedRegions),
<br>+
<br>+ module_info_get_globals(ModuleInfo, Globals),
<br>+ globals.lookup_bool_option(Globals, use_alloc_regions,
<br>+ UseAllocRegions),
<br>+ (
<br>+ UseAllocRegions = yes,
<br>+ % Keep only the regions that are removed but also allocated into.
<br>+ keep_allocated_regions(Inputs, RemovedRegions, Graph,
<br>+ RemovedAndAllocRegions),
<br>+ % Allocated regions are the above plus the carried ones.
<br>+ % The carried here are those that are also allocated into.
<br>+ AllocatedIntoRegions =
<br>+ set.from_list(RemovedAndAllocRegions ++ CarriedRegions)
<br>+ ;
<br>+ UseAllocRegions = no,
<br>+ AllocatedIntoRegions = AllocatedIntoAndReadFrom
<br>+ ),
<br>+
<br>+ % The read-from set is not very important so we are not precise
<br>+ % in estimating it.
<br> RbmmGoalInfo = rbmm_goal_info(set.from_list(CreatedRegions),
<br> set.from_list(RemovedRegions), set.from_list(CarriedRegions),
<br>- AllocatedIntoAndReadFrom, AllocatedIntoAndReadFrom),
<br>+ AllocatedIntoRegions, AllocatedIntoAndReadFrom),
<br> goal_info_set_maybe_rbmm(yes(RbmmGoalInfo), !Info)
<br> ).
<br>
<br>+ % The elements in the first and second lists are corresponding.
<br>+ % Ones in the first list are the nodes in rpt graph therefore we can
<br>+ % check their allocated property, ones in the second list are prog_vars
<br>+ % (after renaming) that represent those in the first.
<br>+ %
<br>+:- pred keep_allocated_regions(list(rptg_node)::in, list(prog_var)::in,
<br>+ rpt_graph::in, list(prog_var)::out) is det.
<br>+
<br>+keep_allocated_regions([], [], _, []).
<br>+keep_allocated_regions([], [_ | _], _, []) :-
<br>+ unexpected(this_file, "keep_allocated_regions: length mismatch").
<br>+keep_allocated_regions([_ | _], [], _, []) :-
<br>+ unexpected(this_file, "keep_allocated_regions: length mismatch").
<br>+keep_allocated_regions([Input | Inputs], [RemovedRegion | RemovedRegions],
<br>+ Graph, RemovedAndAllocRegions) :-
<br>+ keep_allocated_regions(Inputs, RemovedRegions, Graph,
<br>+ RemovedAndAllocRegions0),
<br>+ ( rptg_is_allocated_node(Graph, Input) ->
<br>+ RemovedAndAllocRegions = [RemovedRegion | RemovedAndAllocRegions0]
<br>+ ;
<br>+ RemovedAndAllocRegions = RemovedAndAllocRegions0
<br>+ ).
<br>+
<br> % We do not handle generic calls and calls to foreign procs in RBMM yet,
<br> % so if a program has any of them the RBMM compilation will fail before
<br> % reaching here. We just call sorry now so that they are not
<br>@@ -440,6 +486,8 @@
<br> then
<br> goal_info_set_maybe_rbmm(yes(rbmm_info_init), !Info)
<br> else
<br>+ % We need to try to apply renaming here because the
<br>+ % region name in the Graph may need to be changed.
<br> OriginalName = rptg_lookup_region_name(Graph, Node),
<br> ( map.search(ResurRenaming, OriginalName, ResurNameList) ->
<br> Name = list.det_last(ResurNameList)
<br>@@ -448,18 +496,29 @@
<br> ;
<br> Name = OriginalName
<br> ),
<br>- map.lookup(RegionNameToVar, Name, RegionVar),
<br>- RbmmInfo = rbmm_goal_info(set.init, set.init,
<br>- set.make_singleton_set(RegionVar),
<br>- set.init, set.make_singleton_set(RegionVar)),
<br>+
<br>+ % This region may only be read from in the procedure containing
<br>+ % this deconstruction therefore there might be no entry for it
<br>+ % in RegionNameToVar.
<br>+ ( map.search(RegionNameToVar, Name, RegionVar) ->
<br>+ RbmmInfo = rbmm_goal_info(set.init, set.init,
<br>+ set.make_singleton_set(RegionVar),
<br>+ set.init, set.make_singleton_set(RegionVar))
<br>+ ;
<br>+ RbmmInfo = rbmm_info_init
<br>+ ),
<br> goal_info_set_maybe_rbmm(yes(RbmmInfo), !Info)
<br> )
<br> ;
<br>- ( Unification = assign(_, _)
<br>+ (
<br>+ % XXX We do have assignments between two region variables. But
<br>+ % we do not consider either of them created or removed because
<br>+ % the region they are bound to is still there, i.e., it has been
<br>+ % created and will not be removed.
<br>+ Unification = assign(_, _)
<br> ; Unification = simple_test(_, _)
<br> ),
<br>- goal_info_set_maybe_rbmm(yes(rbmm_goal_info(set.init, set.init,
<br>- set.init, set.init, set.init)), !Info)
<br>+ goal_info_set_maybe_rbmm(yes(rbmm_info_init), !Info)
<br> ;
<br> Unification = complicated_unify(_, _, _),
<br> unexpected(this_file, "collect_rbmm_goal_info_unification:"
<br>Index: rbmm.interproc_region_lifetime.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/rbmm.interproc_region_lifetime.m,v
<br>retrieving revision 1.4
<br>diff -u -r1.4 rbmm.interproc_region_lifetime.m
<br>--- rbmm.interproc_region_lifetime.m 6 Sep 2007 12:45:24 -0000 1.4
<br>+++ rbmm.interproc_region_lifetime.m 28 Nov 2009 01:52:05 -0000
<br>@@ -144,7 +144,7 @@
<br>
<br> :- type rule_pred == (
<br> pred(pred_proc_id, region_set, region_set, proc_region_set_table,
<br>- map(rptg_node, rptg_node), region_set)
<br>+ rpt_call_alpha_mapping, region_set)
<br> ).
<br> :- inst rule_pred == ( pred(in, in, in, in, in, out) is det ).
<br>
<br>@@ -347,8 +347,8 @@
<br> % Rules for eliminating regions from deadR set.
<br> %
<br> :- pred dead_removal_rules(pred_proc_id::in, region_set::in, region_set::in,
<br>- proc_region_set_table::in, map(rptg_node, rptg_node)::in,
<br>- region_set::out) is det.
<br>+ proc_region_set_table::in, rpt_call_alpha_mapping::in, region_set::out)
<br>+ is det.
<br>
<br> dead_removal_rules(Q_Id, LRBefore, LRAfter, DeadRTable, AlphaAtPP, DeadR_q) :-
<br> % The current deadR of q.
<br>@@ -364,7 +364,7 @@
<br> targets_with_more_than_one_source(AlphaAtPP, Targets),
<br> set.fold(dead_removal_rule_2(AlphaAtPP), Targets, DeadR_q1, DeadR_q).
<br>
<br>-:- pred dead_removal_rule_1(map(rptg_node, rptg_node)::in, rptg_node::in,
<br>+:- pred dead_removal_rule_1(rpt_call_alpha_mapping::in, rptg_node::in,
<br> region_set::in, region_set::out) is det.
<br>
<br> dead_removal_rule_1(AlphaAtCallSite, Region, !DeadR_q) :-
<br>@@ -375,7 +375,7 @@
<br> % Remove any r' that is in deadR(q).
<br> set.difference(!.DeadR_q, RPrimes, !:DeadR_q).
<br>
<br>-:- pred dead_removal_rule_2(map(rptg_node, rptg_node)::in, rptg_node::in,
<br>+:- pred dead_removal_rule_2(rpt_call_alpha_mapping::in, rptg_node::in,
<br> set(rptg_node)::in, set(rptg_node)::out) is det.
<br>
<br> dead_removal_rule_2(AlphaAtCallSite, Region, !DeadR_q) :-
<br>@@ -386,7 +386,7 @@
<br> % rules for eliminating regions from bornR set.
<br> %
<br> :- pred born_removal_rules(pred_proc_id::in, region_set::in, region_set::in,
<br>- proc_region_set_table::in, map(rptg_node, rptg_node)::in,
<br>+ proc_region_set_table::in, rpt_call_alpha_mapping::in,
<br> region_set::out) is det.
<br>
<br> born_removal_rules(Q_Id, LRBefore, _, BornRTable, AlphaAtCallSite, BornR_q) :-
<br>@@ -403,7 +403,7 @@
<br> set.fold(born_removal_rule_2(AlphaAtCallSite), Targets,
<br> BornR_q1, BornR_q).
<br>
<br>-:- pred born_removal_rule_1(map(rptg_node, rptg_node)::in, rptg_node::in,
<br>+:- pred born_removal_rule_1(rpt_call_alpha_mapping::in, rptg_node::in,
<br> set(rptg_node)::in, set(rptg_node)::out) is det.
<br>
<br> born_removal_rule_1(AlphaAtCallSite, Region, !BornR_q) :-
<br>@@ -414,7 +414,7 @@
<br> % alpha(r') = r, alpha(r'') = r, r', r'' in bornR(q) imply remove r',
<br> % r'' from bornR(q).
<br> %
<br>-:- pred born_removal_rule_2(map(rptg_node, rptg_node)::in, rptg_node::in,
<br>+:- pred born_removal_rule_2(rpt_call_alpha_mapping::in, rptg_node::in,
<br> set(rptg_node)::in, set(rptg_node)::out) is det.
<br>
<br> born_removal_rule_2(AlphaAtCallSite, Region, !BornR_q) :-
<br>@@ -425,7 +425,7 @@
<br> % Find targets of alpha mapping that are mapped to by more than one
<br> % source.
<br> %
<br>-:- pred targets_with_more_than_one_source(map(rptg_node, rptg_node)::in,
<br>+:- pred targets_with_more_than_one_source(rpt_call_alpha_mapping::in,
<br> region_set::out) is det.
<br>
<br> targets_with_more_than_one_source(AlphaAtCallSite, Targets) :-
<br>Index: rbmm.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/rbmm.m,v
<br>retrieving revision 1.9
<br>diff -u -r1.9 rbmm.m
<br>--- rbmm.m 23 Apr 2009 10:00:24 -0000 1.9
<br>+++ rbmm.m 28 Nov 2009 01:52:05 -0000
<br>@@ -16,7 +16,7 @@
<br> :- module transform_hlds.rbmm.
<br> :- interface.
<br>
<br>-:- include_module actual_region_arguments.
<br>+:- include_module add_rbmm_goal_infos.
<br> :- include_module condition_renaming.
<br> :- include_module execution_path.
<br> :- include_module interproc_region_lifetime.
<br>@@ -25,7 +25,7 @@
<br> :- include_module points_to_analysis.
<br> :- include_module points_to_graph.
<br> :- include_module points_to_info.
<br>-:- include_module add_rbmm_goal_infos.
<br>+:- include_module region_arguments.
<br> :- include_module region_instruction.
<br> :- include_module region_liveness_info.
<br> :- include_module region_resurrection_renaming.
<br>@@ -45,7 +45,6 @@
<br>
<br> :- implementation.
<br>
<br>-:- import_module transform_hlds.rbmm.actual_region_arguments.
<br> :- import_module transform_hlds.rbmm.condition_renaming.
<br> :- import_module transform_hlds.rbmm.execution_path.
<br> :- import_module transform_hlds.rbmm.interproc_region_lifetime.
<br>@@ -53,6 +52,7 @@
<br> :- import_module transform_hlds.rbmm.live_variable_analysis.
<br> :- import_module transform_hlds.rbmm.points_to_analysis.
<br> :- import_module transform_hlds.rbmm.add_rbmm_goal_infos.
<br>+:- import_module transform_hlds.rbmm.region_arguments.
<br> :- import_module transform_hlds.rbmm.region_instruction.
<br> :- import_module transform_hlds.rbmm.region_resurrection_renaming.
<br> :- import_module transform_hlds.rbmm.region_transformation.
<br>@@ -84,9 +84,9 @@
<br> BecomeLiveTable, BecomeDeadBeforeTable, BecomeDeadAfterTable,
<br> RegionInstructionTable),
<br>
<br>- record_actual_region_arguments(!.ModuleInfo, RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable,
<br>- ActualRegionArgumentTable),
<br>+ record_region_arguments(!.ModuleInfo, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, FormalRegionArgTable,
<br>+ ActualRegionArgTable),
<br>
<br> % The region analysis treats region variables as if they are
<br> % imperative-style updatable variables. They may also have scopes
<br>@@ -119,12 +119,12 @@
<br> RptaInfoTable, IteRenamingTable0, IteRenamingTable,
<br> IteRenamingAnnoTable),
<br>
<br>- region_transform(RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>- ActualRegionArgumentTable, ResurRenamingTable, IteRenamingTable,
<br>- RegionInstructionTable, ResurRenamingAnnoTable,
<br>+ region_transform(RptaInfoTable, FormalRegionArgTable,
<br>+ ActualRegionArgTable, ResurRenamingTable,
<br>+ IteRenamingTable, RegionInstructionTable, ResurRenamingAnnoTable,
<br> IteRenamingAnnoTable, map.init, NameToVarTable, !ModuleInfo),
<br>
<br>- collect_rbmm_goal_info(RptaInfoTable, ActualRegionArgumentTable,
<br>+ collect_rbmm_goal_info(RptaInfoTable, ActualRegionArgTable,
<br> ResurRenamingTable, IteRenamingTable, NameToVarTable, !ModuleInfo).
<br>
<br> %-----------------------------------------------------------------------------%
<br>Index: rbmm.points_to_analysis.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/rbmm.points_to_analysis.m,v
<br>retrieving revision 1.12
<br>diff -u -r1.12 rbmm.points_to_analysis.m
<br>--- rbmm.points_to_analysis.m 19 Aug 2009 07:44:57 -0000 1.12
<br>+++ rbmm.points_to_analysis.m 28 Nov 2009 01:52:05 -0000
<br>@@ -772,7 +772,7 @@
<br> %
<br> :- pred alpha_mapping_at_call_site(list(prog_var)::in, list(prog_var)::in,
<br> rpt_graph::in, rpt_graph::in, rpt_graph::out,
<br>- map(rptg_node, rptg_node)::in, map(rptg_node, rptg_node)::out) is det.
<br>+ rpt_call_alpha_mapping::in, rpt_call_alpha_mapping::out) is det.
<br>
<br> alpha_mapping_at_call_site([], [], _, !CallerGraph, !AlphaMap).
<br> alpha_mapping_at_call_site([], [_ | _], _, _, _, _, _) :-
<br>@@ -781,30 +781,33 @@
<br> alpha_mapping_at_call_site([_ | _], [], _, _, _, _, _) :-
<br> unexpected(this_file,
<br> "alpha_mapping_at_call_site: actuals and formals do not match.").
<br>- % Xi's are formal arguments, Yi's are actual arguments at the call site
<br>- %
<br> alpha_mapping_at_call_site([Xi | Xs], [Yi | Ys], CalleeGraph,
<br> !CallerGraph, !AlphaMap) :-
<br>+ % Xi's are formal arguments, Yi's are actual arguments at the call site.
<br> rptg_get_node_by_variable(CalleeGraph, Xi, N_Xi),
<br> rptg_get_node_by_variable(!.CallerGraph, Yi, N_Yi),
<br> ( map.search(!.AlphaMap, N_Xi, N_Y) ->
<br> % alpha(N_Xi) = N_Y, alpha(N_Xi) = N_Yi, N_Y != N_Yi.
<br> %
<br>- ( N_Y \= N_Yi ->
<br>+ ( N_Y = N_Yi ->
<br>+ true
<br>+ ;
<br> % Apply rule P4.
<br> unify_operator(N_Y, N_Yi, !CallerGraph),
<br>
<br> % Apply rule P1 after some nodes are unified.
<br> rule_1(N_Y, !CallerGraph)
<br>- ;
<br>- true
<br> )
<br> ;
<br> svmap.set(N_Xi, N_Yi, !AlphaMap),
<br>
<br>- % N_Yi inherits N_Xi's is_allocated.
<br>- IsAlloc = rptg_lookup_node_is_allocated(CalleeGraph, N_Xi),
<br>- rptg_set_node_is_allocated(N_Yi, IsAlloc, !CallerGraph)
<br>+ % If N_Xi's is_allocated then N_Yi is also allocated.
<br>+ % Otherwise leave N_Yi alone.
<br>+ ( rptg_is_allocated_node(CalleeGraph, N_Xi) ->
<br>+ rptg_set_node_is_allocated(N_Yi, bool.yes, !CallerGraph)
<br>+ ;
<br>+ true
<br>+ )
<br> ),
<br> alpha_mapping_at_call_site(Xs, Ys, CalleeGraph, !CallerGraph, !AlphaMap).
<br>
<br>@@ -930,9 +933,12 @@
<br> svmap.set(CalleeM, CallerM, AlphaAtCallSite0, AlphaAtCallSite1),
<br> svmap.set(CallSite, AlphaAtCallSite1, !CallerAlphaMapping),
<br>
<br>- % CallerM inherits CalleeM's is_allocated.
<br>- IsAlloc = rptg_lookup_node_is_allocated(CalleeGraph, CalleeM),
<br>- rptg_set_node_is_allocated(CallerM, IsAlloc, !CallerGraph)
<br>+ % If CalleeM's is_allocated then CallerM is also allocated.
<br>+ % Otherwise leave CallerM alone.
<br>+ ( rptg_is_allocated_node(CalleeGraph, CalleeM) ->
<br>+ rptg_set_node_is_allocated(CallerM, bool.yes, !CallerGraph)
<br>+ ; true
<br>+ )
<br> )
<br> else
<br> true
<br>Index: rbmm.points_to_graph.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/rbmm.points_to_graph.m,v
<br>retrieving revision 1.4
<br>diff -u -r1.4 rbmm.points_to_graph.m
<br>--- rbmm.points_to_graph.m 21 Apr 2009 14:05:55 -0000 1.4
<br>+++ rbmm.points_to_graph.m 28 Nov 2009 01:52:05 -0000
<br>@@ -179,6 +179,8 @@
<br> :- func rptg_lookup_node_vars(rpt_graph, rptg_node) = set(prog_var).
<br> :- func rptg_lookup_node_is_allocated(rpt_graph, rptg_node) = bool.
<br>
<br>+:- pred rptg_is_allocated_node(rpt_graph::in, rptg_node::in) is semidet.
<br>+
<br> % Return the list of edges (edge id's).
<br> %
<br> :- func rptg_lookup_list_outedges(rpt_graph, rptg_node) = list(rptg_edge).
<br>@@ -589,6 +591,10 @@
<br> NodeContent = rptg_get_node_content(Graph, Node),
<br> IsAllocated = rptg_node_content_get_is_allocated(NodeContent).
<br>
<br>+rptg_is_allocated_node(Graph, Region) :-
<br>+ IsAlloc = rptg_lookup_node_is_allocated(Graph, Region),
<br>+ IsAlloc = bool.yes.
<br>+
<br> rptg_lookup_list_outedges(Graph, Node) = EdgeList :-
<br> OutEdgesOfNode = rptg_lookup_map_outedges(Graph, Node),
<br> map.keys(OutEdgesOfNode, EdgeList).
<br>@@ -987,9 +993,6 @@
<br> Processed = [Node | Processed0],
<br>
<br> % Take out-edges of the Node and update the remembered list.
<br>- %OutEdges = rptg_get_outedges(Graph),
<br>- %map.lookup(OutEdges, Node, OutEdgesOfNode),
<br>- %map.keys(OutEdgesOfNode, EdgeList),
<br> EdgeList = rptg_lookup_list_outedges(Graph, Node),
<br> list.foldl(
<br> update_remembered_list(Selector, HLDS, TypeX, Graph, Processed),
<br>Index: rbmm.points_to_info.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/rbmm.points_to_info.m,v
<br>retrieving revision 1.4
<br>diff -u -r1.4 rbmm.points_to_info.m
<br>--- rbmm.points_to_info.m 21 Apr 2009 14:05:55 -0000 1.4
<br>+++ rbmm.points_to_info.m 28 Nov 2009 01:52:05 -0000
<br>@@ -37,8 +37,6 @@
<br> :- pred rpta_info_table_set_rpta_info(pred_proc_id::in, rpta_info::in,
<br> rpta_info_table::in, rpta_info_table::out) is det.
<br>
<br>- % type rpta_info and operations
<br>- %
<br> :- type rpta_info
<br> ---> rpta_info(rpt_graph, rpt_alpha_mapping).
<br>
<br>@@ -52,7 +50,16 @@
<br>
<br> %-----------------------------------------------------------------------------%
<br>
<br>-:- type rpt_alpha_mapping == map(program_point, map(rptg_node, rptg_node)).
<br>+ % This type represents the alpha mapping of all call sites in a procedure.
<br>+ % For documentation of alpha mappings, see Chapter 4 in Quan's thesis;
<br>+ % basically, they map the nodes in the region points-to graph of the callee
<br>+ % to the corresponding nodes in the caller.
<br>+ %
<br>+:- type rpt_alpha_mapping == map(program_point, rpt_call_alpha_mapping).
<br>+
<br>+ % This type represents the alpha mapping at one call site.
<br>+ %
<br>+:- type rpt_call_alpha_mapping == map(rptg_node, rptg_node).
<br>
<br> %-----------------------------------------------------------------------------%
<br> %-----------------------------------------------------------------------------%
<br>@@ -77,15 +84,13 @@
<br> %-----------------------------------------------------------------------------%
<br>
<br> rpta_info_table_init = map.init.
<br>+
<br> rpta_info_table_search_rpta_info(PredProcId, Table) = RptaInfo :-
<br> Table ^ elem(PredProcId) = RptaInfo.
<br>-rpta_info_table_set_rpta_info(PredProcId, RptaInfo, Table0, Table) :-
<br>- Table = Table0 ^ elem(PredProcId) := RptaInfo.
<br>
<br>- % The rpta_info will be for a specific procedure, so at the beginning
<br>- % the alpha mapping is empty and the rpt graph contains all the nodes
<br>- % corresponding to all the variables appear in the procedure.
<br>- %
<br>+rpta_info_table_set_rpta_info(PredProcId, RptaInfo, !Table) :-
<br>+ !Table ^ elem(PredProcId) := RptaInfo.
<br>+
<br> rpta_info_init(ProcInfo) = RptaInfo :-
<br> proc_info_get_vartypes(ProcInfo, VarTypes),
<br> map.keys(VarTypes, Vars),
<br>@@ -139,8 +144,8 @@
<br> AlphaMappingAtCallSiteA,AlphaMappingAtCallSiteB),
<br> rpt_alpha_mapping_equal_2(CallSiteAs, AlphaMappingA, AlphaMappingB).
<br>
<br>-:- pred rpt_alpha_mapping_at_call_site_equal(map(rptg_node, rptg_node)::in,
<br>- map(rptg_node, rptg_node)::in) is semidet.
<br>+:- pred rpt_alpha_mapping_at_call_site_equal(rpt_call_alpha_mapping::in,
<br>+ rpt_call_alpha_mapping::in) is semidet.
<br>
<br> rpt_alpha_mapping_at_call_site_equal(AMAtCallSiteA, AMAtCallSiteB) :-
<br> map.count(AMAtCallSiteA, CA),
<br>@@ -151,7 +156,7 @@
<br> AMAtCallSiteB).
<br>
<br> :- pred rpt_alpha_mapping_at_call_site_equal_2(list(rptg_node)::in,
<br>- map(rptg_node, rptg_node)::in, map(rptg_node, rptg_node)::in) is semidet.
<br>+ rpt_call_alpha_mapping::in, rpt_call_alpha_mapping::in) is semidet.
<br>
<br> rpt_alpha_mapping_at_call_site_equal_2([], _, _).
<br> rpt_alpha_mapping_at_call_site_equal_2([N | Ns], AMAtCallSiteA,
<br>Index: rbmm.region_arguments.m
<br>===================================================================
<br>RCS file: rbmm.region_arguments.m
<br>diff -N rbmm.region_arguments.m
<br>--- /dev/null 1 Jan 1970 00:00:00 -0000
<br>+++ rbmm.region_arguments.m 28 Nov 2009 01:52:06 -0000
<br>@@ -0,0 +1,334 @@
<br>+% -----------------------------------------------------------------------------%
<br>+% vim: ft=mercury ts=4 sw=4 et
<br>+%-----------------------------------------------------------------------------%
<br>+% Copyright (C) 2009 The University of Melbourne.
<br>+% This file may only be copied under the terms of the GNU General
<br>+% Public License - see the file COPYING in the Mercury distribution.
<br>+%-----------------------------------------------------------------------------%
<br>+%
<br>+% File: rbmm.region_arguments.m.
<br>+% Main author: qph.
<br>+%
<br>+% We will pass regions as extra arguments in procedure calls.
<br>+% After the region liveness analysis we can decide on what region variables
<br>+% need to be region arguments (for procedures and calls).
<br>+% This module derives the formal region arguments for procedures and
<br>+% the actual region arguments at call sites in each procedure.
<br>+% This information will be used to extend the argument lists of procedures
<br>+% and calls in the HLDS.
<br>+
<br>+%-----------------------------------------------------------------------------%
<br>+%-----------------------------------------------------------------------------%
<br>+
<br>+:- module transform_hlds.rbmm.region_arguments.
<br>+:- interface.
<br>+
<br>+:- import_module hlds.
<br>+:- import_module hlds.hlds_module.
<br>+:- import_module hlds.hlds_pred.
<br>+:- import_module transform_hlds.rbmm.points_to_graph.
<br>+:- import_module transform_hlds.rbmm.points_to_info.
<br>+:- import_module transform_hlds.rbmm.region_liveness_info.
<br>+:- import_module transform_hlds.smm_common.
<br>+
<br>+:- import_module list.
<br>+:- import_module map.
<br>+
<br>+:- type proc_formal_region_args_table
<br>+ == map(
<br>+ pred_proc_id,
<br>+ region_args
<br>+ ).
<br>+
<br>+:- type proc_pp_actual_region_args_table
<br>+ == map(
<br>+ pred_proc_id,
<br>+ pp_actual_region_args_table
<br>+ ).
<br>+
<br>+:- type pp_actual_region_args_table
<br>+ == map(
<br>+ program_point,
<br>+ region_args
<br>+ ).
<br>+
<br>+:- type region_args
<br>+ ---> region_args(
<br>+ list(rptg_node), % constant (carried) region arguments.
<br>+ list(rptg_node), % inputs (removed).
<br>+ list(rptg_node) % outputs (created).
<br>+ ).
<br>+
<br>+:- pred record_region_arguments(module_info::in, rpta_info_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_formal_region_args_table::out,
<br>+ proc_pp_actual_region_args_table::out) is det.
<br>+
<br>+%-----------------------------------------------------------------------------%
<br>+%-----------------------------------------------------------------------------%
<br>+
<br>+:- implementation.
<br>+
<br>+:- import_module check_hlds.
<br>+:- import_module check_hlds.goal_path.
<br>+:- import_module hlds.hlds_goal.
<br>+:- import_module libs.
<br>+:- import_module libs.compiler_util.
<br>+
<br>+:- import_module set.
<br>+:- import_module string.
<br>+:- import_module svmap.
<br>+
<br>+record_region_arguments(ModuleInfo, RptaInfoTable, ConstantRTable,
<br>+ DeadRTable, BornRTable, FormalRegionArgTable, ActualRegionArgTable) :-
<br>+ module_info_predids(PredIds, ModuleInfo, _),
<br>+ list.foldl2(record_actual_region_arguments_pred(ModuleInfo,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>+ PredIds, map.init, FormalRegionArgTable,
<br>+ map.init, ActualRegionArgTable).
<br>+
<br>+:- pred record_actual_region_arguments_pred(module_info::in,
<br>+ rpta_info_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in, pred_id::in,
<br>+ proc_formal_region_args_table::in,
<br>+ proc_formal_region_args_table::out,
<br>+ proc_pp_actual_region_args_table::in,
<br>+ proc_pp_actual_region_args_table::out) is det.
<br>+
<br>+record_actual_region_arguments_pred(ModuleInfo, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, PredId,
<br>+ !FormalRegionArgTable, !ActualRegionArgTable) :-
<br>+ module_info_pred_info(ModuleInfo, PredId, PredInfo),
<br>+ ProcIds = pred_info_non_imported_procids(PredInfo),
<br>+ list.foldl2(record_region_arguments_proc(ModuleInfo, PredId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable), ProcIds,
<br>+ !FormalRegionArgTable, !ActualRegionArgTable).
<br>+
<br>+:- pred record_region_arguments_proc(module_info::in, pred_id::in,
<br>+ rpta_info_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in, proc_id::in,
<br>+ proc_formal_region_args_table::in,
<br>+ proc_formal_region_args_table::out,
<br>+ proc_pp_actual_region_args_table::in,
<br>+ proc_pp_actual_region_args_table::out) is det.
<br>+
<br>+record_region_arguments_proc(ModuleInfo, PredId, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, ProcId,
<br>+ !FormalRegionArgTable, !ActualRegionArgTable) :-
<br>+ PPId = proc(PredId, ProcId),
<br>+ ( if some_are_special_preds([PPId], ModuleInfo)
<br>+ then true
<br>+ else
<br>+ record_formal_region_arguments_proc(PPId, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, !FormalRegionArgTable),
<br>+
<br>+ module_info_proc_info(ModuleInfo, PPId, ProcInfo0),
<br>+ fill_goal_path_slots(ModuleInfo, ProcInfo0, ProcInfo),
<br>+ proc_info_get_goal(ProcInfo, Body),
<br>+ record_actual_region_arguments_goal(ModuleInfo, PPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Body,
<br>+ !FormalRegionArgTable, map.init, ActualRegionArgProc),
<br>+ svmap.set(PPId, ActualRegionArgProc, !ActualRegionArgTable)
<br>+ ).
<br>+
<br>+:- pred record_formal_region_arguments_proc(pred_proc_id::in,
<br>+ rpta_info_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in,
<br>+ proc_formal_region_args_table::in, proc_formal_region_args_table::out)
<br>+ is det.
<br>+
<br>+record_formal_region_arguments_proc(PPId, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, !FormalRegionArgTable) :-
<br>+ ( map.search(!.FormalRegionArgTable, PPId, _) ->
<br>+ true
<br>+ ;
<br>+ map.lookup(ConstantRTable, PPId, ConstantR),
<br>+ map.lookup(DeadRTable, PPId, DeadR),
<br>+ map.lookup(BornRTable, PPId, BornR),
<br>+
<br>+ map.lookup(RptaInfoTable, PPId, RptaInfo),
<br>+ RptaInfo = rpta_info(Graph, _),
<br>+
<br>+ % Formal constant, allocated-into region arguments.
<br>+ set.to_sorted_list(ConstantR, LConstantR),
<br>+ list.filter(rptg_is_allocated_node(Graph),
<br>+ LConstantR, LFormalConstantAllocR),
<br>+
<br>+ % Formal dead region arguments.
<br>+ set.to_sorted_list(DeadR, FormalDeadR),
<br>+
<br>+ % Formal born region arguments.
<br>+ set.to_sorted_list(BornR, FormalBornR),
<br>+
<br>+ svmap.det_insert(PPId,
<br>+ region_args(LFormalConstantAllocR, FormalDeadR, FormalBornR),
<br>+ !FormalRegionArgTable)
<br>+ ).
<br>+
<br>+:- pred record_actual_region_arguments_goal(module_info::in,
<br>+ pred_proc_id::in, rpta_info_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in, hlds_goal::in,
<br>+ proc_formal_region_args_table::in, proc_formal_region_args_table::out,
<br>+ pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>+
<br>+record_actual_region_arguments_goal(ModuleInfo, PPId, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, Goal,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc) :-
<br>+ Goal = hlds_goal(Expr, Info),
<br>+ record_actual_region_arguments_expr(Expr, Info, ModuleInfo, PPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc).
<br>+
<br>+:- pred record_actual_region_arguments_expr(hlds_goal_expr::in,
<br>+ hlds_goal_info::in, module_info::in, pred_proc_id::in,
<br>+ rpta_info_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in,
<br>+ proc_formal_region_args_table::in, proc_formal_region_args_table::out,
<br>+ pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>+
<br>+record_actual_region_arguments_expr(GoalExpr, GoalInfo, ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc) :-
<br>+ (
<br>+ GoalExpr = plain_call(PredId, ProcId, _, _, _, _),
<br>+ CalleePPId = proc(PredId, ProcId),
<br>+ ( some_are_special_preds([CalleePPId], ModuleInfo) ->
<br>+ true
<br>+ ;
<br>+ CallSite = program_point_init(GoalInfo),
<br>+ record_actual_region_arguments_call_site(CallerPPId, CallSite,
<br>+ CalleePPId, RptaInfoTable, ConstantRTable, DeadRTable,
<br>+ BornRTable, !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ )
<br>+ ;
<br>+ GoalExpr = conj(_, Conjuncts),
<br>+ list.foldl2(
<br>+ record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>+ Conjuncts, !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ ;
<br>+ GoalExpr = disj(Disjuncts),
<br>+ list.foldl2(
<br>+ record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>+ Disjuncts, !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ ;
<br>+ GoalExpr = if_then_else(_, Cond, Then, Else),
<br>+ record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Cond,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc),
<br>+ record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Then,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc),
<br>+ record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, Else,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ ;
<br>+ GoalExpr = switch(_, _, Cases),
<br>+ list.foldl2(
<br>+ record_actual_region_arguments_case(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable),
<br>+ Cases, !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ ;
<br>+ GoalExpr = generic_call(_, _, _, _),
<br>+ sorry(this_file,
<br>+ "record_actual_region_arguments_expr: generic_call NYI")
<br>+ ;
<br>+ GoalExpr = call_foreign_proc(_, _, _, _, _, _, _),
<br>+ sorry(this_file,
<br>+ "record_actual_region_arguments_expr: call_foreign_proc NYI")
<br>+ ;
<br>+ GoalExpr = negation(SubGoal),
<br>+ record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, SubGoal,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ ;
<br>+ GoalExpr = unify(_, _, _, _, _)
<br>+ ;
<br>+ GoalExpr = scope(_, SubGoal),
<br>+ % XXX We should special-case the handling of from_ground_term_construct
<br>+ % scopes.
<br>+ record_actual_region_arguments_goal(ModuleInfo, CallerPPId,
<br>+ RptaInfoTable, ConstantRTable, DeadRTable, BornRTable, SubGoal,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ ;
<br>+ GoalExpr = shorthand(_),
<br>+ unexpected(this_file,
<br>+ "record_actual_region_arguments_expr: shorthand")
<br>+ ).
<br>+
<br>+:- pred record_actual_region_arguments_case(module_info::in,
<br>+ pred_proc_id::in, rpta_info_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in, case::in,
<br>+ proc_formal_region_args_table::in, proc_formal_region_args_table::out,
<br>+ pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>+
<br>+record_actual_region_arguments_case(ModuleInfo, PPId, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, Case,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc) :-
<br>+ Case = case(_, _, Goal),
<br>+ record_actual_region_arguments_goal(ModuleInfo, PPId, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, Goal,
<br>+ !FormalRegionArgTable, !ActualRegionArgProc).
<br>+
<br>+ % Region variables in deadR and in bornR are passed as arguments.
<br>+ % Out of the region variables in constantR (constant in the sense that
<br>+ % their bindings will not change during the call) we only pass ones that
<br>+ % may be allocated into as arguments. The actual region arguments are
<br>+ % computed according to these lines.
<br>+ %
<br>+:- pred record_actual_region_arguments_call_site(pred_proc_id::in,
<br>+ program_point::in, pred_proc_id::in,
<br>+ rpta_info_table::in, proc_region_set_table::in,
<br>+ proc_region_set_table::in, proc_region_set_table::in,
<br>+ proc_formal_region_args_table::in, proc_formal_region_args_table::out,
<br>+ pp_actual_region_args_table::in, pp_actual_region_args_table::out) is det.
<br>+
<br>+record_actual_region_arguments_call_site(CallerPPId, CallSite,
<br>+ CalleePPId, RptaInfoTable, ConstantRTable, DeadRTable,
<br>+ BornRTable, !FormalRegionArgTable, !ActualRegionArgProc) :-
<br>+ ( map.search(!.FormalRegionArgTable, CalleePPId, FormalRegionArgCallee) ->
<br>+ % If the formal region arguments of the called procedure have been
<br>+ % computed, the corresponding actual ones can be straightforwardly
<br>+ % derived using the call site's alpha mapping.
<br>+ FormalRegionArgCallee =
<br>+ region_args(FormalConstants, FormalDeads, FormalBorns),
<br>+ map.lookup(RptaInfoTable, CallerPPId, CallerRptaInfo),
<br>+ CallerRptaInfo = rpta_info(_CallerGraph, CallerAlpha),
<br>+ map.lookup(CallerAlpha, CallSite, AlphaAtCallSite),
<br>+ list.foldr(find_actual_param(AlphaAtCallSite), FormalConstants,
<br>+ [], ActualConstants),
<br>+ list.foldr(find_actual_param(AlphaAtCallSite), FormalDeads,
<br>+ [], ActualDeads),
<br>+ list.foldr(find_actual_param(AlphaAtCallSite), FormalBorns,
<br>+ [], ActualBorns),
<br>+ svmap.det_insert(CallSite,
<br>+ region_args(ActualConstants, ActualDeads, ActualBorns),
<br>+ !ActualRegionArgProc)
<br>+ ;
<br>+ % The formal region arguments of the called procedure haven't been
<br>+ % recorded, so do it now.
<br>+ record_formal_region_arguments_proc(CalleePPId, RptaInfoTable,
<br>+ ConstantRTable, DeadRTable, BornRTable, !FormalRegionArgTable),
<br>+
<br>+ % We try again at this call site after the formal region arguments
<br>+ % are recorded.
<br>+ record_actual_region_arguments_call_site(CallerPPId, CallSite,
<br>+ CalleePPId, RptaInfoTable, ConstantRTable, DeadRTable,
<br>+ BornRTable, !FormalRegionArgTable, !ActualRegionArgProc)
<br>+ ).
<br>+
<br>+:- pred find_actual_param(rpt_call_alpha_mapping::in, rptg_node::in,
<br>+ list(rptg_node)::in, list(rptg_node)::out) is det.
<br>+
<br>+find_actual_param(Alpha_PP, Formal, Actuals0, Actuals) :-
<br>+ map.lookup(Alpha_PP, Formal, Actual),
<br>+ Actuals = [Actual | Actuals0].
<br>+
<br>+%-----------------------------------------------------------------------------%
<br>+
<br>+:- func this_file = string.
<br>+
<br>+this_file = "rbmm.region_arguments.m".
<br>+
<br>+%-----------------------------------------------------------------------------%
<br>Index: rbmm.region_transformation.m
<br>===================================================================
<br>RCS file: /home/mercury/mercury1/repository/mercury/compiler/rbmm.region_transformation.m,v
<br>retrieving revision 1.12
<br>diff -u -r1.12 rbmm.region_transformation.m
<br>--- rbmm.region_transformation.m 8 Sep 2009 02:43:38 -0000 1.12
<br>+++ rbmm.region_transformation.m 28 Nov 2009 01:52:06 -0000
<br>@@ -27,10 +27,9 @@
<br> :- import_module hlds.hlds_pred.
<br> :- import_module parse_tree.
<br> :- import_module parse_tree.prog_data.
<br>-:- import_module transform_hlds.rbmm.actual_region_arguments.
<br> :- import_module transform_hlds.rbmm.points_to_info.
<br>+:- import_module transform_hlds.rbmm.region_arguments.
<br> :- import_module transform_hlds.rbmm.region_instruction.
<br>-:- import_module transform_hlds.rbmm.region_liveness_info.
<br> :- import_module transform_hlds.rbmm.region_resurrection_renaming.
<br>
<br> :- import_module map.
<br>@@ -45,21 +44,24 @@
<br> :- type name_to_prog_var == map(string, prog_var).
<br>
<br> % The names of the predicates for creating and removing regions.
<br>- % The predicates are in mercury_region_builtin_module.
<br>+ % The predicates are in region_builtin library module.
<br> %
<br> :- func create_region_pred_name = string.
<br> :- func remove_region_pred_name = string.
<br>
<br>- % XXX Besides changing the HLDS, this predicate also returns a mapping
<br>- % from a region name to a program variable which represents the
<br>- % region. We will only create a new program variable for a region
<br>- % name which is not yet in the map. Currently this map is only used
<br>- % in this transformation. If we do not need the map later on we should
<br>- % not return it.
<br>+ % Besides changing the HLDS with region information, this predicate also
<br>+ % returns a mapping from a region name to a program variable which
<br>+ % represents the region. We will only create a new program variable for a
<br>+ % region name which is not yet in the map. This information is needed when
<br>+ % computing rbmm_goal_info. Note that because we only pass as argument to
<br>+ % a procedure a region that will be allocated into, be removed, or be
<br>+ % created in the procedure, some regions in the rpt graph of the procedure
<br>+ % may not need to be presented by program variables. They are the regions
<br>+ % that only be read from in the procedure. Therefore there are NO entries
<br>+ % for them in the region_name-to-prog_var map.
<br> %
<br>-:- pred region_transform(rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in,
<br>- proc_pp_actual_region_args_table::in,
<br>+:- pred region_transform(rpta_info_table::in,
<br>+ proc_formal_region_args_table::in, proc_pp_actual_region_args_table::in,
<br> renaming_table::in, renaming_table::in, region_instr_table::in,
<br> renaming_annotation_table::in, renaming_annotation_table::in,
<br> name_to_prog_var_table::in, name_to_prog_var_table::out,
<br>@@ -105,15 +107,13 @@
<br> create_region_pred_name = "create_region".
<br> remove_region_pred_name = "remove_region".
<br>
<br>-region_transform(RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>+region_transform(RptaInfoTable, FormalRegionArgTable, ActualRegionArgTable,
<br>+ ResurRenamingTable, IteRenamingTable, RegionInstructionTable,
<br>+ ResurRenamingAnnoTable, IteRenamingAnnoTable, !NameToVarTable,
<br>+ !ModuleInfo) :-
<br>+ map.foldl2(annotate_pred, FormalRegionArgTable, [], PredIds, !ModuleInfo),
<br>+ list.foldl2(region_transform_pred(RptaInfoTable, FormalRegionArgTable,
<br> ActualRegionArgTable, ResurRenamingTable, IteRenamingTable,
<br>- RegionInstructionTable, ResurRenamingAnnoTable, IteRenamingAnnoTable,
<br>- !NameToVarTable, !ModuleInfo) :-
<br>- map.foldl2(annotate_pred(DeadRTable, BornRTable), ConstantRTable, [],
<br>- PredIds, !ModuleInfo),
<br>- list.foldl2(region_transform_pred(RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable, ActualRegionArgTable,
<br>- ResurRenamingTable, IteRenamingTable,
<br> RegionInstructionTable, ResurRenamingAnnoTable, IteRenamingAnnoTable),
<br> PredIds, !NameToVarTable, !ModuleInfo),
<br>
<br>@@ -121,7 +121,6 @@
<br> % annotated with region information and recorded. This is necessary
<br> % because recompute_instmap_delta_proc and repuritycheck_proc need to
<br> % look up information about the (annotated) called procedures.
<br>-
<br> list.foldl(update_instmap_delta_pred, PredIds, !ModuleInfo),
<br> list.foldl(recheck_purity_pred, PredIds, !ModuleInfo).
<br>
<br>@@ -133,22 +132,20 @@
<br> % 2. Argument types: arg_types, updated with region type for region
<br> % arguments.
<br> %
<br>-:- pred annotate_pred(proc_region_set_table::in, proc_region_set_table::in,
<br>- pred_proc_id::in, region_set::in, list(pred_id)::in, list(pred_id)::out,
<br>+:- pred annotate_pred(pred_proc_id::in, region_args::in,
<br>+ list(pred_id)::in, list(pred_id)::out,
<br> module_info::in, module_info::out) is det.
<br>
<br>-annotate_pred(DeadRTable, BornRTable, PPId, ConstantR, !Processed,
<br>- !ModuleInfo) :-
<br>+annotate_pred(PPId, FormalRegionArgs, !Processed, !ModuleInfo) :-
<br> PPId = proc(PredId, _),
<br> ( list.member(PredId, !.Processed) ->
<br> true
<br> ;
<br> some [!PredInfo] (
<br> module_info_pred_info(!.ModuleInfo, PredId, !:PredInfo),
<br>- map.lookup(DeadRTable, PPId, DeadR),
<br>- map.lookup(BornRTable, PPId, BornR),
<br>- NumberOfRegArgs = set.count(DeadR) + set.count(BornR) +
<br>- set.count(ConstantR),
<br>+ FormalRegionArgs = region_args(Constants, Deads, Borns),
<br>+ NumberOfRegArgs = list.length(Constants) + list.length(Deads) +
<br>+ list.length(Borns),
<br> Arity = pred_info_orig_arity(!.PredInfo),
<br> pred_info_set_orig_arity(Arity + NumberOfRegArgs, !PredInfo),
<br>
<br>@@ -174,22 +171,22 @@
<br>
<br> % This predicate transforms the procedures of a predicate.
<br> %
<br>-:- pred region_transform_pred(rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in,
<br>+:- pred region_transform_pred(rpta_info_table::in,
<br>+ proc_formal_region_args_table::in,
<br> proc_pp_actual_region_args_table::in,
<br> renaming_table::in, renaming_table::in, region_instr_table::in,
<br> renaming_annotation_table::in, renaming_annotation_table::in,
<br> pred_id::in, name_to_prog_var_table::in, name_to_prog_var_table::out,
<br> module_info::in, module_info::out) is det.
<br>
<br>-region_transform_pred(RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>+region_transform_pred(RptaInfoTable, FormalRegionArgTable,
<br> ActualRegionArgTable, ResurRenamingTable, IteRenamingTable,
<br> RegionInstructionTable, ResurRenamingAnnoTable, IteRenamingAnnoTable,
<br> PredId, !NameToVarTable, !ModuleInfo) :-
<br> module_info_pred_info(!.ModuleInfo, PredId, PredInfo),
<br> ProcIds = pred_info_non_imported_procids(PredInfo),
<br> list.foldl2(region_transform_proc(RptaInfoTable,
<br>- ConstantRTable, DeadRTable, BornRTable, ActualRegionArgTable,
<br>+ FormalRegionArgTable, ActualRegionArgTable,
<br> ResurRenamingTable, IteRenamingTable,
<br> RegionInstructionTable, ResurRenamingAnnoTable, IteRenamingAnnoTable,
<br> PredId), ProcIds, !NameToVarTable, !ModuleInfo).
<br>@@ -208,15 +205,14 @@
<br> % As said above, we will recompute instmap delta, recheck purity for
<br> % this annotated procedure after all the procedures have been transformed.
<br> %
<br>-:- pred region_transform_proc(rpta_info_table::in, proc_region_set_table::in,
<br>- proc_region_set_table::in, proc_region_set_table::in,
<br>- proc_pp_actual_region_args_table::in,
<br>+:- pred region_transform_proc(rpta_info_table::in,
<br>+ proc_formal_region_args_table::in, proc_pp_actual_region_args_table::in,
<br> renaming_table::in, renaming_table::in, region_instr_table::in,
<br> renaming_annotation_table::in, renaming_annotation_table::in,
<br> pred_id::in, proc_id::in, name_to_prog_var_table::in,
<br> name_to_prog_var_table::out, module_info::in, module_info::out) is det.
<br>
<br>-region_transform_proc(RptaInfoTable, ConstantRTable, DeadRTable, BornRTable,
<br>+region_transform_proc(RptaInfoTable, FormalRegionArgTable,
<br> ActualRegionArgTable, ResurRenamingTable, IteRenamingTable,
<br> RegionInstructionTable, ResurRenamingAnnoTable, IteRenamingAnnoTable,
<br> PredId, ProcId, !NameToVarTable, !ModuleInfo) :-
<br>@@ -229,9 +225,7 @@
<br> proc_info_get_argmodes(ProcInfo1, ActualArgModes0),
<br> proc_info_get_goal(ProcInfo1, Goal0),
<br> map.lookup(RptaInfoTable, PPId, rpta_info(Graph, _)),
<br>- map.lookup(ConstantRTable, PPId, ConstantR),
<br>- map.lookup(DeadRTable, PPId, DeadR),
<br>- map.lookup(BornRTable, PPId, BornR),
<br>+ map.lookup(FormalRegionArgTable, PPId, FormalRegionArgProc),
<br> map.lookup(ActualRegionArgTable, PPId, ActualRegionArgProc),
<br> ( map.search(ResurRenamingTable, PPId, ResurRenamingProc0) ->
<br> ResurRenamingProc = ResurRenamingProc0,
<br>@@ -249,7 +243,7 @@
<br> ),
<br> map.lookup(RegionInstructionTable, PPId, RegionInstructionProc),
<br> NameToVar0 = map.init,
<br>- annotate_proc(!.ModuleInfo, PredInfo0, Graph, ConstantR, DeadR, BornR,
<br>+ annotate_proc(!.ModuleInfo, PredInfo0, Graph, FormalRegionArgProc,
<br> ActualRegionArgProc, ResurRenamingProc, IteRenamingProc,
<br> RegionInstructionProc, ResurRenamingAnnoProc, IteRenamingAnnoProc,
<br> VarSet0, _, VarTypes0, _, HeadVars0, _, ActualArgModes0, _,
<br>@@ -269,16 +263,15 @@
<br> % + new calls to region instructions
<br> %
<br> :- pred annotate_proc(module_info::in, pred_info::in, rpt_graph::in,
<br>- region_set::in, region_set::in, region_set::in,
<br>- pp_actual_region_args_table::in, renaming_proc::in, renaming_proc::in,
<br>- region_instr_proc::in, renaming_annotation_proc::in,
<br>+ region_args::in, pp_actual_region_args_table::in, renaming_proc::in,
<br>+ renaming_proc::in, region_instr_proc::in, renaming_annotation_proc::in,
<br> renaming_annotation_proc::in, prog_varset::in, prog_varset::out,
<br> vartypes::in, vartypes::out, list(prog_var)::in, list(prog_var)::out,
<br> list(mer_mode)::in, list(mer_mode)::out, hlds_goal::in, hlds_goal::out,
<br> name_to_prog_var::in, name_to_prog_var::out, proc_info::in,
<br> proc_info::out) is det.
<br>
<br>-annotate_proc(ModuleInfo, PredInfo, Graph, ConstantR, DeadR, BornR,
<br>+annotate_proc(ModuleInfo, PredInfo, Graph, FormalRegionArgProc,
<br> ActualRegionArgProc, ResurRenamingProc, IteRenamingProc,
<br> RegionInstructionProc, ResurRenamingAnnoProc, IteRenamingAnnoProc,
<br> !VarSet, !VarTypes, !HeadVars, !ActualArgModes, !Goal,
<br>@@ -302,18 +295,17 @@
<br> % Note that formal region arguments are not subjected to renaming.
<br> %
<br> % Along with the extra arguments we also add extra modes for them.
<br>- set.to_sorted_list(ConstantR, LConstantR),
<br>- set.to_sorted_list(DeadR, LDeadR),
<br>- set.to_sorted_list(BornR, LBornR),
<br>- FormalInputNodes = LConstantR ++ LDeadR,
<br>- FormalNodes = FormalInputNodes ++ LBornR,
<br>+
<br>+ FormalRegionArgProc = region_args(Constants, Deads, Borns),
<br>+ FormalInputNodes = Constants ++ Deads,
<br>+ FormalNodes = FormalInputNodes ++ Borns,
<br> list.map_foldl3(node_to_var(Graph), FormalNodes, FormalRegionArgs,
<br> !NameToVar, !VarSet, !VarTypes),
<br>
<br> InMode = in_mode,
<br> OutMode = out_mode,
<br> list.duplicate(list.length(FormalInputNodes), InMode, InModes),
<br>- list.duplicate(list.length(LBornR), OutMode, OutModes),
<br>+ list.duplicate(list.length(Borns), OutMode, OutModes),
<br>
<br> % Notice that the output of a function needs to be the last argument.
<br> PredOrFunc = pred_info_is_pred_or_func(PredInfo),
<br>@@ -438,9 +430,9 @@
<br> ( map.search(ActualRegionArgProc, ProgPoint, ActualNodes0) ->
<br> ActualNodes = ActualNodes0
<br> ;
<br>- ActualNodes = actual_region_args([], [], [])
<br>+ ActualNodes = region_args([], [], [])
<br> ),
<br>- ActualNodes = actual_region_args(Constants, Ins, Outs),
<br>+ ActualNodes = region_args(Constants, Ins, Outs),
<br> AllNodes = Constants ++ Ins ++ Outs,
<br> list.map_foldl3(
<br> node_to_var_with_both_renamings(Graph, ResurRenaming, IteRenaming),
<br>cvs diff: Diffing notes
<br><br>Disclaimer: <a href="http://www.kuleuven.be/cwis/email_disclaimer.htm" target="_top" rel="nofollow">http://www.kuleuven.be/cwis/email_disclaimer.htm</a><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26544205&i=0" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26544205&i=1" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26544205&i=2" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26539836
Re: for review: new calling convention for exported procedures to java
2009-11-27T01:28:14Z
2009-11-27T01:28:14Z
Julien Fischer-2
<br>Hi,
<br><br>On Thu, 26 Nov 2009, Peter Wang wrote:
<br><div class='shrinkable-quote'><br>> Branches: main
<br>>
<br>> Add a new calling convention for Mercury procedures exported to Java with
<br>> `:- pragma foreign_export'. When the procedure has multiple output arguments,
<br>> require the caller to pass instances of a `Ref<T>' class which contain a field
<br>> to hold the output value. This is more verbose than return an `Object[]'
<br>> array, and requires extra memory allocations, but is more type-safe. Another
<br>> advantage is that the Ref arguments will appear at the same positions as the
<br>> output arguments in the Mercury procedure.
<br>>
<br>> The new convention must be enabled with `--java-export-ref-out'. The plan is
<br>> to enable it by default in the future.
<br>>
<br>> compiler/options.m:
<br>> doc/reference_manual.texi:
<br>> Add the option.
<br>>
<br>> compiler/ml_proc_gen.m:
<br>> When the option is set, disable `--det-copy-out' and generate the
<br>> function parameters assuming pass-by-reference for outputs.
<br>> Only use the new convention when necessary.
<br>>
<br>> compiler/mlds_to_java.m:
<br>> Make the code to generate the exported forwarding methods account for
<br>> `mlds_ptr_type' parameters. These are converted to `Ref<T>' arguments.
<br>>
<br>> java/runtime/Ref.java:
<br>> Add the reference class.
</div><br>I've had a quick look over this. The new scheme is a definite
<br>improvment over the old way of doing things so I would be quite happy
<br>for it to become the default now. I've had a quick glance over the code
<br>and it seem okay; I'll take a closer look next week - feel free to
<br>commit it in the meantime
<br><br>Julien.
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26539836&i=0" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26539836&i=1" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26539836&i=2" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26537671
Re: for review: Re-factor the MR_join_and_continue macro.
2009-11-26T19:50:50Z
2009-11-26T19:50:50Z
Paul Bone
On Mon, Nov 23, 2009 at 02:09:01PM +1100, Paul Bone wrote:
<br>>
<br>> For review by someone familiar with the low-level C backend, probably Zoltan.
<br>>
<br>> - Thanks, Paul.
<br>>
<br>> Re-factor the MR_join_and_continue macro.
<br>>
<br><br>This alternative change is much simplier in that it doesn't require
<br>modifications to the compiler.
<br><br>For post commit review.
<br><br>Re-factor the MR_join_and_continue macro.
<br><br>This change replaces the MR_join_and_continue macro with a C procedure. A
<br>smaller macro named MR_join_and_continue wraps the new C procedure and provides
<br>a trampoline to prevent C stack leaks. MR_join_and_continue will now have the
<br>additional cost of a C procedure call rather than always being inlined. This
<br>code is only used in the implementation of parallel conjunctions in the low
<br>level C grades, it does not affect other grades.
<br><br>An earlier revision of this code was causing deadlocks, to debug them support
<br>was added to the MR_SIGNAL MR_BROADCAST and MR_WAIT macros to enable better
<br>logging of the use of condition variables when MR_DEBUG_THREADS is defined at
<br>compile time.
<br><br>This change passes bootcheck and the test suite in the asm_fast.gc.par grade.
<br><br>runtime/mercury_context.h:
<br>runtime/mercury_context.c:
<br> Created MR_do_join_and_continue procedure from old MR_join_and_continue
<br> macro.
<br> Added additional comments to this procedure, describing how it works.
<br> Created a new macro MR_join_and_continue that wraps the new procedure.
<br> Conform to changes in the MR_WAIT, MR_SIGNAL and MR_BROADCAST macros.
<br><br>runtime/mercury_thread.h:
<br> Added a from parameter to the MR_WAIT, MR_SIGNAL and MR_BROADCAST macros.
<br> Added a from parameter to the C procedures' declarations that implement the
<br> debugging versions of the condition operations above.
<br> Adjusted the formatting of these declarations to match the C style used in
<br> the project.
<br><br>runtime/mercury_thread.c:
<br> The C procedures implementing the debugging versions of the condition
<br> operations now print out their from parameter.
<br> MR_cond_broadcast now uses "broadcast" in it's log message rather than
<br> "signal"
<br> MR_cond_wait's log message now more clearly specifies which argument is the
<br> lock and which is the condition variable.
<br><br>Index: runtime/mercury_context.c
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/runtime/mercury_context.c,v
<br>retrieving revision 1.70
<br>diff -u -p -b -r1.70 mercury_context.c
<br>--- runtime/mercury_context.c 6 Nov 2009 05:40:24 -0000 1.70
<br>+++ runtime/mercury_context.c 27 Nov 2009 00:36:45 -0000
<br>@@ -787,9 +787,9 @@ MR_schedule_context(MR_Context *ctxt)
<br> ** we wake up all the waiting threads.
<br> */
<br> if (ctxt->MR_ctxt_resume_owner_thread == (MercuryThread) NULL) {
<br>- MR_SIGNAL(&MR_runqueue_cond);
<br>+ MR_SIGNAL(&MR_runqueue_cond, "schedule_context");
<br> } else {
<br>- MR_BROADCAST(&MR_runqueue_cond);
<br>+ MR_BROADCAST(&MR_runqueue_cond, "schedule_context");
<br> }
<br> #endif
<br> MR_UNLOCK(&MR_runqueue_lock, "schedule_context");
<br>@@ -803,7 +803,7 @@ MR_schedule_spark_globally(const MR_Spar
<br> MR_wsdeque_push_bottom(&MR_spark_queue, proto_spark);
<br> MR_num_outstanding_contexts_and_global_sparks++;
<br> MR_atomic_inc_int(&MR_num_outstanding_contexts_and_all_sparks);
<br>- MR_SIGNAL(&MR_runqueue_cond);
<br>+ MR_SIGNAL(&MR_runqueue_cond, "schedule_spark_globally");
<br> MR_UNLOCK(&MR_runqueue_lock, "schedule_spark_globally");
<br> }
<br> #endif /* !MR_LL_PARALLEL_CONJ */
<br>@@ -825,6 +825,7 @@ MR_define_entry(MR_do_runnext);
<br> MR_Spark spark;
<br> unsigned depth;
<br> MercuryThread thd;
<br>+ int wait_result;
<br>
<br> #ifdef MR_PROFILE_PARALLEL_EXECUTION_SUPPORT
<br> MR_Timer runnext_timer;
<br>@@ -903,8 +904,10 @@ MR_define_entry(MR_do_runnext);
<br> &MR_profile_parallel_executed_nothing);
<br> }
<br> #endif
<br>- while (MR_WAIT(&MR_runqueue_cond, &MR_runqueue_lock) != 0) {
<br>- }
<br>+ do {
<br>+ wait_result =
<br>+ MR_WAIT(&MR_runqueue_cond, &MR_runqueue_lock, "do_runnext");
<br>+ } while (wait_result != 0);
<br> }
<br>
<br> ReadyContext:
<br>@@ -986,6 +989,126 @@ MR_END_MODULE
<br> #endif /* !MR_HIGHLEVEL_CODE */
<br>
<br> #ifdef MR_LL_PARALLEL_CONJ
<br>+MR_Code*
<br>+MR_do_join_and_continue(MR_SyncTerm *jnc_st, MR_Code *join_label)
<br>+{
<br>+ if (!jnc_st->MR_st_is_shared) {
<br>+ /* This parallel conjunction has only executed sequentially. */
<br>+ if (--jnc_st->MR_st_count == 0) {
<br>+ /*
<br>+ ** It has finished executing, continue execution from the join
<br>+ ** label.
<br>+ */
<br>+ return join_label;
<br>+ } else {
<br>+ /*
<br>+ ** It has not finished executing. Try to finish it by executing
<br>+ ** our sparks.
<br>+ ** This code was formerly MR_join_and_continue_1()
<br>+ */
<br>+ MR_Context *jnc_ctxt;
<br>+ MR_bool jnc_popped;
<br>+ MR_Spark jnc_spark;
<br>+
<br>+ jnc_ctxt = MR_ENGINE(MR_eng_this_context);
<br>+ jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque,
<br>+ &jnc_spark);
<br>+ if (jnc_popped) {
<br>+ MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks);
<br>+ return jnc_spark.MR_spark_resume;
<br>+ } else {
<br>+ /*
<br>+ ** Someone's stolen our sparks, we should try to execute
<br>+ ** something that's been scheduled globally. XXX: We don't yet
<br>+ ** have work stealing so how can this happen!?
<br>+ */
<br>+ fprintf(stderr, "My sparks have been stolen!! %lp", pthread_self());
<br>+ return MR_ENTRY(MR_do_runnext);
<br>+ }
<br>+ }
<br>+ } else {
<br>+ /* This parallel conjunction may be executing in parallel. */
<br>+ MR_LOCK(&MR_sync_term_lock, "continue");
<br>+ if (--jnc_st->MR_st_count == 0) {
<br>+ /* This parallel conjunction has finished. */
<br>+ if (MR_ENGINE(MR_eng_this_context) == jnc_st->MR_st_orig_context) {
<br>+ /*
<br>+ ** This context originated this parallel conjunction and all
<br>+ ** the branches have finished so jump to the join label.
<br>+ */
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue i");
<br>+ return join_label;
<br>+ } else {
<br>+ /*
<br>+ ** This context didn't originate this parallel conjunction and
<br>+ ** we're the last branch to finish. The originating context
<br>+ ** should be suspended waiting for us to finish, so wake it up.
<br>+ */
<br>+ jnc_st->MR_st_orig_context->MR_ctxt_resume = join_label;
<br>+ MR_schedule_context(jnc_st->MR_st_orig_context);
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue ii");
<br>+ return MR_ENTRY(MR_do_runnext);
<br>+ }
<br>+ } else {
<br>+ /*
<br>+ ** The parallel conjunction is being executed in parallel but it is
<br>+ ** not yet finished. This code was Formerly
<br>+ ** MR_join_and_continue_2()
<br>+ */
<br>+ MR_Context *jnc_ctxt;
<br>+ MR_bool jnc_popped;
<br>+ MR_Spark jnc_spark;
<br>+
<br>+ jnc_ctxt = MR_ENGINE(MR_eng_this_context);
<br>+ jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque,
<br>+ &jnc_spark);
<br>+ if (jnc_popped && (jnc_spark.MR_spark_parent_sp == MR_parent_sp)) {
<br>+ /*
<br>+ ** The spark at the top of the stack is from to the same parallel
<br>+ ** conjunction that we've just been executing. We can immediately
<br>+ ** execute the next branch of the same parallel conjunction in
<br>+ ** the current context.
<br>+ */
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue_2 i");
<br>+ MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks);
<br>+ return jnc_spark.MR_spark_resume;
<br>+ } else {
<br>+ /*
<br>+ ** The spark stack is empty or the next spark is from a different
<br>+ ** parallel conjunction to the one we've been executing. Either
<br>+ ** way, there's nothing more we can do with this context right
<br>+ ** now. Put back the spark we won't be using.
<br>+ */
<br>+ if (jnc_popped) {
<br>+ MR_wsdeque_putback_bottom(&jnc_ctxt->MR_ctxt_spark_deque,
<br>+ &jnc_spark);
<br>+ }
<br>+ /*
<br>+ ** If this context originated the parallel conjunction we've been
<br>+ ** executing, the rest of the parallel conjunction must have been
<br>+ ** put on the global spark queue to be executed in other
<br>+ ** contexts. This context will need to be resumed once the
<br>+ ** parallel conjunction is completed, so suspend the context.
<br>+ **
<br>+ ** What if the other conjuncts where put on the global queue
<br>+ ** but haven't yet been taken by other threads? Then this step
<br>+ ** is redundant. It's not worth fixing, this problem will go
<br>+ ** away once we enable work-stealing. - pbone.
<br>+ */
<br>+ if (jnc_ctxt == jnc_st->MR_st_orig_context) {
<br>+ MR_save_context(jnc_ctxt);
<br>+ MR_ENGINE(MR_eng_this_context) = NULL;
<br>+ }
<br>+ /* Finally look for other work. */
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue_2 ii");
<br>+ return MR_ENTRY(MR_do_runnext);
<br>+ }
<br>+ }
<br>+ }
<br>+}
<br>+#endif
<br>+
<br>+#ifdef MR_LL_PARALLEL_CONJ
<br>
<br> /*
<br> * Debugging functions for runtime granularity control.
<br>Index: runtime/mercury_context.h
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/runtime/mercury_context.h,v
<br>retrieving revision 1.55
<br>diff -u -p -b -r1.55 mercury_context.h
<br>--- runtime/mercury_context.h 17 Nov 2009 06:30:26 -0000 1.55
<br>+++ runtime/mercury_context.h 27 Nov 2009 00:49:46 -0000
<br>@@ -811,111 +811,15 @@ extern void MR_schedule_context(
<br> MR_atomic_inc_int(&MR_num_outstanding_contexts_and_all_sparks); \
<br> } while (0)
<br>
<br>- #define MR_join_and_continue(sync_term, join_label) \
<br>- do { \
<br>- MR_SyncTerm *jnc_st = (MR_SyncTerm *) &sync_term; \
<br>- \
<br>- if (!jnc_st->MR_st_is_shared) { \
<br>- /* This parallel conjunction has only executed sequentially. */ \
<br>- if (--jnc_st->MR_st_count == 0) { \
<br>- MR_GOTO(join_label); \
<br>- } else { \
<br>- MR_join_and_continue_1(); \
<br>- } \
<br>- } else { \
<br>- /* This parallel conjunction may be executing in parallel. */ \
<br>- MR_LOCK(&MR_sync_term_lock, "continue"); \
<br>- if (--jnc_st->MR_st_count == 0) { \
<br>- if (MR_ENGINE(MR_eng_this_context) \
<br>- == jnc_st->MR_st_orig_context) \
<br>- { \
<br>- /* \
<br>- ** This context originated this parallel conjunction and \
<br>- ** all the branches have finished so jump to the join \
<br>- ** label. \
<br>- */ \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue i"); \
<br>- MR_GOTO(join_label); \
<br>- } else { \
<br>- /* \
<br>- ** This context didn't originate this parallel \
<br>- ** conjunction and we're the last branch to finish. The \
<br>- ** originating context should be suspended waiting for us \
<br>- ** to finish, so wake it up. \
<br>- */ \
<br>- jnc_st->MR_st_orig_context->MR_ctxt_resume = join_label; \
<br>- MR_schedule_context(jnc_st->MR_st_orig_context); \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue ii"); \
<br>- MR_runnext(); \
<br>- } \
<br>- } else { \
<br>- MR_join_and_continue_2(); \
<br>- } \
<br>- } \
<br>- } while (0)
<br>+extern MR_Code*
<br>+MR_do_join_and_continue(MR_SyncTerm *sync_term, MR_Code *join_label);
<br>
<br>- #define MR_join_and_continue_1() \
<br>- do { \
<br>- MR_Context *jnc_ctxt; \
<br>- MR_bool jnc_popped; \
<br>- MR_Spark jnc_spark; \
<br>- \
<br>- jnc_ctxt = MR_ENGINE(MR_eng_this_context); \
<br>- jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque, \
<br>- &jnc_spark); \
<br>- if (jnc_popped) { \
<br>- MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks); \
<br>- MR_GOTO(jnc_spark.MR_spark_resume); \
<br>- } else { \
<br>- MR_runnext(); \
<br>- } \
<br>- } while (0)
<br>-
<br>- #define MR_join_and_continue_2() \
<br>+ #define MR_join_and_continue(sync_term, join_label) \
<br> do { \
<br>- MR_Context *jnc_ctxt; \
<br>- MR_bool jnc_popped; \
<br>- MR_Spark jnc_spark; \
<br>- \
<br>- jnc_ctxt = MR_ENGINE(MR_eng_this_context); \
<br>- jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque, \
<br>- &jnc_spark); \
<br>- if (jnc_popped && (jnc_spark.MR_spark_parent_sp == MR_parent_sp)) { \
<br>- /* \
<br>- ** The spark at the top of the stack is due to the same parallel \
<br>- ** conjunction that we've just been executing. We can immediately \
<br>- ** execute the next branch of the same parallel conjunction in \
<br>- ** the current context. \
<br>- */ \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue_2 i"); \
<br>- MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks); \
<br>- MR_GOTO(jnc_spark.MR_spark_resume); \
<br>- } else { \
<br>- /* \
<br>- ** The spark stack is empty or the next spark is from a different \
<br>- ** parallel conjunction to the one we've been executing. Either \
<br>- ** way, there's nothing more we can do with this context right \
<br>- ** now. Put back the spark we won't be using. \
<br>- */ \
<br>- if (jnc_popped) { \
<br>- MR_wsdeque_putback_bottom(&jnc_ctxt->MR_ctxt_spark_deque, \
<br>- &jnc_spark); \
<br>- } \
<br>- /* \
<br>- ** If this context originated the parallel conjunction we've been \
<br>- ** executing, the rest of the parallel conjunction must have been \
<br>- ** put on the global spark queue to be executed in other \
<br>- ** contexts. This context will need to be resumed once the \
<br>- ** parallel conjunction is completed, so suspend the context. \
<br>- */ \
<br>- if (jnc_ctxt == jnc_st->MR_st_orig_context) { \
<br>- MR_save_context(jnc_ctxt); \
<br>- MR_ENGINE(MR_eng_this_context) = NULL; \
<br>- } \
<br>- /* Finally look for other work. */ \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue_2 ii"); \
<br>- MR_runnext(); \
<br>- } \
<br>+ MR_Code *jump_target; \
<br>+ jump_target = \
<br>+ MR_do_join_and_continue((MR_SyncTerm*) &(sync_term), join_label); \
<br>+ MR_GOTO(jump_target); \
<br> } while (0)
<br>
<br> /* This needs to come after the definition of MR_SparkDeque_Struct. */
<br>Index: runtime/mercury_thread.c
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/runtime/mercury_thread.c,v
<br>retrieving revision 1.35
<br>diff -u -p -b -r1.35 mercury_thread.c
<br>--- runtime/mercury_thread.c 23 Aug 2009 22:52:35 -0000 1.35
<br>+++ runtime/mercury_thread.c 26 Nov 2009 23:25:34 -0000
<br>@@ -221,34 +221,36 @@ MR_mutex_unlock(MercuryLock *lock, const
<br> }
<br>
<br> int
<br>-MR_cond_signal(MercuryCond *cond)
<br>+MR_cond_signal(MercuryCond *cond, const char *from)
<br> {
<br> int err;
<br>
<br>- fprintf(stderr, "%ld signaling %p\n", (long) pthread_self(), cond);
<br>+ fprintf(stderr, "%ld signaling %p (%s)\n",
<br>+ (long) pthread_self(), cond, from);
<br> err = pthread_cond_signal(cond);
<br> assert(err == 0);
<br> return err;
<br> }
<br>
<br> int
<br>-MR_cond_broadcast(MercuryCond *cond)
<br>+MR_cond_broadcast(MercuryCond *cond, const char *from)
<br> {
<br> int err;
<br>
<br>- fprintf(stderr, "%ld signaling %p\n", (long) pthread_self(), cond);
<br>+ fprintf(stderr, "%ld broadcasting %p (%s)\n",
<br>+ (long) pthread_self(), cond, from);
<br> err = pthread_cond_broadcast(cond);
<br> assert(err == 0);
<br> return err;
<br> }
<br>
<br> int
<br>-MR_cond_wait(MercuryCond *cond, MercuryLock *lock)
<br>+MR_cond_wait(MercuryCond *cond, MercuryLock *lock, const char *from)
<br> {
<br> int err;
<br>
<br>- fprintf(stderr, "%ld waiting on %p (%p)\n", (long) pthread_self(),
<br>- cond, lock);
<br>+ fprintf(stderr, "%ld waiting on cond: %p lock: %p (%s)\n",
<br>+ (long) pthread_self(), cond, lock, from);
<br> err = pthread_cond_wait(cond, lock);
<br> assert(err == 0);
<br> return err;
<br>Index: runtime/mercury_thread.h
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/runtime/mercury_thread.h,v
<br>retrieving revision 1.27
<br>diff -u -p -b -r1.27 mercury_thread.h
<br>--- runtime/mercury_thread.h 4 Jun 2009 08:07:10 -0000 1.27
<br>+++ runtime/mercury_thread.h 27 Nov 2009 01:41:46 -0000
<br>@@ -31,11 +31,16 @@
<br> typedef pthread_mutex_t MercuryLock;
<br> typedef pthread_cond_t MercuryCond;
<br>
<br>- extern int MR_mutex_lock(MercuryLock *lock, const char *from);
<br>- extern int MR_mutex_unlock(MercuryLock *lock, const char *from);
<br>- extern int MR_cond_signal(MercuryCond *cond);
<br>- extern int MR_cond_broadcast(MercuryCond *cond);
<br>- extern int MR_cond_wait(MercuryCond *cond, MercuryLock *lock);
<br>+extern int
<br>+MR_mutex_lock(MercuryLock *lock, const char *from);
<br>+extern int
<br>+MR_mutex_unlock(MercuryLock *lock, const char *from);
<br>+extern int
<br>+MR_cond_signal(MercuryCond *cond, const char *from);
<br>+extern int
<br>+MR_cond_broadcast(MercuryCond *cond, const char *from);
<br>+extern int
<br>+MR_cond_wait(MercuryCond *cond, MercuryLock *lock, const char *from);
<br>
<br> extern MR_bool MR_debug_threads;
<br>
<br>@@ -48,9 +53,9 @@
<br> #define MR_LOCK(lck, from) pthread_mutex_lock((lck))
<br> #define MR_UNLOCK(lck, from) pthread_mutex_unlock((lck))
<br>
<br>- #define MR_SIGNAL(cnd) pthread_cond_signal((cnd))
<br>- #define MR_BROADCAST(cnd) pthread_cond_broadcast((cnd))
<br>- #define MR_WAIT(cnd, mtx) pthread_cond_wait((cnd), (mtx))
<br>+ #define MR_SIGNAL(cnd, from) pthread_cond_signal((cnd))
<br>+ #define MR_BROADCAST(cnd, from) pthread_cond_broadcast((cnd))
<br>+ #define MR_WAIT(cnd, mtx, from) pthread_cond_wait((cnd), (mtx))
<br> #else
<br> #define MR_LOCK(lck, from) \
<br> ( MR_debug_threads ? \
<br>@@ -65,21 +70,21 @@
<br> pthread_mutex_unlock((lck)) \
<br> )
<br>
<br>- #define MR_SIGNAL(cnd) \
<br>+ #define MR_SIGNAL(cnd, from) \
<br> ( MR_debug_threads ? \
<br>- MR_cond_signal((cnd)) \
<br>+ MR_cond_signal((cnd), (from)) \
<br> : \
<br> pthread_cond_signal((cnd)) \
<br> )
<br>- #define MR_BROADCAST(cnd) \
<br>+ #define MR_BROADCAST(cnd, from) \
<br> ( MR_debug_threads ? \
<br>- MR_cond_broadcast((cnd)) \
<br>+ MR_cond_broadcast((cnd), (from)) \
<br> : \
<br> pthread_cond_broadcast((cnd)) \
<br> )
<br>- #define MR_WAIT(cnd, mtx) \
<br>+ #define MR_WAIT(cnd, mtx, from) \
<br> ( MR_debug_threads ? \
<br>- MR_cond_wait((cnd), (mtx)) \
<br>+ MR_cond_wait((cnd), (mtx), (from)) \
<br> : \
<br> pthread_cond_wait((cnd), (mtx)) \
<br> )
<br>@@ -155,9 +160,9 @@
<br> #define MR_LOCK(nothing, from) do { } while (0)
<br> #define MR_UNLOCK(nothing, from) do { } while (0)
<br>
<br>- #define MR_SIGNAL(nothing) do { } while (0)
<br>- #define MR_BROADCAST(nothing) do { } while (0)
<br>- #define MR_WAIT(no, thing) (0)
<br>+ #define MR_SIGNAL(nothing, from) do { } while (0)
<br>+ #define MR_BROADCAST(nothing, from) do { } while (0)
<br>+ #define MR_WAIT(no, thing, from) (0)
<br>
<br> #define MR_OBTAIN_GLOBAL_LOCK(where) do { } while (0)
<br> #define MR_RELEASE_GLOBAL_LOCK(where) do { } while (0)
<br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26537671/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26537597
Re: mercury web site down
2009-11-26T19:35:05Z
2009-11-26T19:35:05Z
Paul Bone
On Thu, Nov 26, 2009 at 09:09:38PM +1100, Paul Bone wrote:
<br>> On Thu, Nov 26, 2009 at 08:52:52PM +1100, Peter Ross wrote:
<br>> > Search google for mercury logic
<br>> >
<br>> > and none of the sites work.
<br>>
<br>> Thanks Peter R. Peter W has already reported this. I'll investigate this
<br>> tomorrow as it requires liasing with the department. (It's their fault).
<br>>
<br><br>Follow discussion of this should occur on the mercury-local mailing list.
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26537597/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Dev-f14120.html" embed="fixTarget[14120]" target="_top" >Mercury - Dev</a></p>
tag:old.nabble.com,2006:post-26527119
Re: mercury web site down
2009-11-26T02:09:38Z
2009-11-26T02:09:38Z
Paul Bone
On Thu, Nov 26, 2009 at 08:52:52PM +1100, Peter Ross wrote:
<br>> Search google for mercury logic
<br>>
<br>> and none of the sites work.
<br><br>Thanks Peter R. Peter W has already reported this. I'll investigate this
<br>tomorrow as it requires liasing with the department. (It's their fault).
<br><br>Meanwhile try:
<br><a href="http://www.mercury.csse.unimelb.edu.au/" target="_top" rel="nofollow">http://www.mercury.csse.unimelb.edu.au/</a><br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26527119/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Dev-f14120.html" embed="fixTarget[14120]" target="_top" >Mercury - Dev</a></p>
tag:old.nabble.com,2006:post-26526924
mercury web site down
2009-11-26T01:52:52Z
2009-11-26T01:52:52Z
Peter Ross-2
Search google for mercury logic
<br><br>and none of the sites work.
<br><br>--
<br>Peter Ross - Mission Critical Australia
<br>AU: +61 424 651 834
<br>BE: +32 485 482 559
<br>--------------------------------------------------------------------------
<br>mercury-developers mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26526924&i=0" target="_top" rel="nofollow">mercury-developers@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26526924&i=1" target="_top" rel="nofollow">owner-mercury-developers@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26526924&i=2" target="_top" rel="nofollow">mercury-developers-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Dev-f14120.html" embed="fixTarget[14120]" target="_top" >Mercury - Dev</a></p>
tag:old.nabble.com,2006:post-26524371
Re: for review: gcc 4 with llds grades
2009-11-25T20:56:44Z
2009-11-25T20:56:44Z
Peter Wang-6
Branches: main
<br><br>compiler/purity.m:
<br> Downgrade an XXX.
<br><br>diff --git a/compiler/purity.m b/compiler/purity.m
<br>index 76baad6..56890fd 100644
<br>--- a/compiler/purity.m
<br>+++ b/compiler/purity.m
<br>@@ -289,9 +289,9 @@ puritycheck_pred(PredId, !PredInfo, ModuleInfo, !Specs) :-
<br> WorstPurity = Purity,
<br> perform_pred_purity_checks(!.PredInfo, Purity, DeclPurity,
<br> PromisedPurity, PurityCheckResult0),
<br>- % XXX Work around a segfault while purity checking invalid/purity/purity.m.
<br>- % It seems to be due to gcc 4.1.2 on x86-64 miscompiling the computed
<br>- % goto following the workaround at gcc -O1 and above.
<br>+ % This was to avoid a crash in the following computed goto, when compiled
<br>+ % with gcc 4.1 on x86-64. The problem seems to be gone now, but there's not
<br>+ % much to gain from removing the workaround.
<br> PurityCheckResult = workaround_gcc_bug(PurityCheckResult0),
<br> (
<br> PurityCheckResult = inconsistent_promise,
<br><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26524371&i=0" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26524371&i=1" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26524371&i=2" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26523676
for review: new calling convention for exported procedures to java
2009-11-25T18:45:59Z
2009-11-25T18:45:59Z
Peter Wang-6
Branches: main
<br><br>Add a new calling convention for Mercury procedures exported to Java with
<br>`:- pragma foreign_export'. When the procedure has multiple output arguments,
<br>require the caller to pass instances of a `Ref<T>' class which contain a field
<br>to hold the output value. This is more verbose than return an `Object[]'
<br>array, and requires extra memory allocations, but is more type-safe. Another
<br>advantage is that the Ref arguments will appear at the same positions as the
<br>output arguments in the Mercury procedure.
<br><br>The new convention must be enabled with `--java-export-ref-out'. The plan is
<br>to enable it by default in the future.
<br><br>compiler/options.m:
<br>doc/reference_manual.texi:
<br> Add the option.
<br><br>compiler/ml_proc_gen.m:
<br> When the option is set, disable `--det-copy-out' and generate the
<br> function parameters assuming pass-by-reference for outputs.
<br> Only use the new convention when necessary.
<br><br>compiler/mlds_to_java.m:
<br> Make the code to generate the exported forwarding methods account for
<br> `mlds_ptr_type' parameters. These are converted to `Ref<T>' arguments.
<br><br>java/runtime/Ref.java:
<br> Add the reference class.
<br><br>diff --git a/compiler/ml_proc_gen.m b/compiler/ml_proc_gen.m
<br>index f5922a5..2b566fb 100644
<br>--- a/compiler/ml_proc_gen.m
<br>+++ b/compiler/ml_proc_gen.m
<br>@@ -54,6 +54,8 @@
<br> :- import_module parse_tree.prog_type.
<br>
<br> :- import_module bool.
<br>+:- import_module getopt_io.
<br>+:- import_module int.
<br> :- import_module list.
<br> :- import_module map.
<br> :- import_module maybe.
<br>@@ -208,11 +210,43 @@ ml_gen_pragma_export_proc(ModuleInfo, PragmaExportedProc, Defn) :-
<br> PragmaExportedProc = pragma_exported_proc(Lang, PredId, ProcId,
<br> ExportName, ProgContext),
<br> ml_gen_proc_label(ModuleInfo, PredId, ProcId, Name, ModuleName),
<br>- FuncParams = ml_gen_proc_params(ModuleInfo, PredId, ProcId),
<br>+ ml_gen_export_proc_params(ModuleInfo, PredId, ProcId, FuncParams),
<br> MLDS_Context = mlds_make_context(ProgContext),
<br> Defn = ml_pragma_export(Lang, ExportName,
<br> qual(ModuleName, module_qual, Name), FuncParams, MLDS_Context).
<br>
<br>+:- pred ml_gen_export_proc_params(module_info::in, pred_id::in, proc_id::in,
<br>+ mlds_func_params::out) is det.
<br>+
<br>+ml_gen_export_proc_params(ModuleInfo, PredId, ProcId, FuncParams) :-
<br>+ module_info_get_globals(ModuleInfo, Globals),
<br>+ globals.get_target(Globals, Target),
<br>+ (
<br>+ Target = target_java,
<br>+ globals.lookup_bool_option(Globals, java_export_ref_out, yes),
<br>+ globals.set_option(det_copy_out, bool(no), Globals, GlobalsByRef),
<br>+ module_info_set_globals(GlobalsByRef, ModuleInfo, ModuleInfoByRef),
<br>+ FuncParamsByRef = ml_gen_proc_params(ModuleInfoByRef, PredId, ProcId),
<br>+ FuncParamsByRef = mlds_func_params(Args, ReturnTypes),
<br>+ (
<br>+ ReturnTypes = [],
<br>+ % If there is only one output argument, then we should use the
<br>+ % return value.
<br>+ list.filter(has_ptr_type, Args, OutArgs),
<br>+ list.length(OutArgs) > 1
<br>+ ;
<br>+ ReturnTypes = [_ | _]
<br>+ )
<br>+ ->
<br>+ FuncParams = FuncParamsByRef
<br>+ ;
<br>+ FuncParams = ml_gen_proc_params(ModuleInfo, PredId, ProcId)
<br>+ ).
<br>+
<br>+:- pred has_ptr_type(mlds_argument::in) is semidet.
<br>+
<br>+has_ptr_type(mlds_argument(_, mlds_ptr_type(_), _)).
<br>+
<br> %-----------------------------------------------------------------------------%
<br> %
<br> % Stuff to generate MLDS code for HLDS predicates & functions.
<br>diff --git a/compiler/mlds_to_java.m b/compiler/mlds_to_java.m
<br>index 8229e62..84437da 100644
<br>--- a/compiler/mlds_to_java.m
<br>+++ b/compiler/mlds_to_java.m
<br>@@ -491,10 +491,14 @@ mlds_get_java_foreign_code(AllForeignCode) = ForeignCode :-
<br> :- pred output_exports(java_out_info::in, indent::in,
<br> list(mlds_pragma_export)::in, io::di, io::uo) is det.
<br>
<br>-output_exports(_, _, [], !IO).
<br>-output_exports(Info, Indent, [Export | Exports], !IO) :-
<br>- Export = ml_pragma_export(Lang, ExportName, MLDS_Name, MLDS_Signature,
<br>- MLDS_Context),
<br>+output_exports(Info, Indent, Exports, !IO) :-
<br>+ list.foldl(output_export(Info, Indent), Exports, !IO).
<br>+
<br>+:- pred output_export(java_out_info::in, indent::in, mlds_pragma_export::in,
<br>+ io::di, io::uo) is det.
<br>+
<br>+output_export(Info, Indent, Export, !IO) :-
<br>+ Export = ml_pragma_export(Lang, ExportName, _, MLDS_Signature, _),
<br> expect(unify(Lang, lang_java), this_file,
<br> "foreign_export for language other than Java."),
<br> indent_line(Indent, !IO),
<br>@@ -512,6 +516,30 @@ output_exports(Info, Indent, [Export | Exports], !IO) :-
<br> io.write_string("java.lang.Object []", !IO)
<br> ),
<br> io.write_string(" " ++ ExportName, !IO),
<br>+ (
<br>+ list.member(Param, Parameters),
<br>+ has_ptr_type(Param)
<br>+ ->
<br>+ (
<br>+ ( ReturnTypes = []
<br>+ ; ReturnTypes = [_]
<br>+ ),
<br>+ output_export_ref_out(Info, Indent, Export, !IO)
<br>+ ;
<br>+ ReturnTypes = [_, _ | _],
<br>+ unexpected(this_file, "output_export: multiple return values")
<br>+ )
<br>+ ;
<br>+ output_export_no_ref_out(Info, Indent, Export, !IO)
<br>+ ).
<br>+
<br>+:- pred output_export_no_ref_out(java_out_info::in, indent::in,
<br>+ mlds_pragma_export::in, io::di, io::uo) is det.
<br>+
<br>+output_export_no_ref_out(Info, Indent, Export, !IO) :-
<br>+ Export = ml_pragma_export(_Lang, _ExportName, MLDS_Name, MLDS_Signature,
<br>+ MLDS_Context),
<br>+ MLDS_Signature = mlds_func_params(Parameters, ReturnTypes),
<br> output_params(Info, Indent + 1, MLDS_Context, Parameters, !IO),
<br> io.nl(!IO),
<br> indent_line(Indent, !IO),
<br>@@ -523,17 +551,122 @@ output_exports(Info, Indent, [Export | Exports], !IO) :-
<br> ReturnTypes = [_ | _],
<br> io.write_string("return ", !IO)
<br> ),
<br>+ write_export_call(MLDS_Name, Parameters, !IO),
<br>+ indent_line(Indent, !IO),
<br>+ io.write_string("}\n", !IO).
<br>+
<br>+:- pred output_export_ref_out(java_out_info::in, indent::in,
<br>+ mlds_pragma_export::in, io::di, io::uo) is det.
<br>+
<br>+output_export_ref_out(Info, Indent, Export, !IO) :-
<br>+ Export = ml_pragma_export(_Lang, _ExportName, MLDS_Name, MLDS_Signature,
<br>+ MLDS_Context),
<br>+ MLDS_Signature = mlds_func_params(Parameters, ReturnTypes),
<br>+ list.filter(has_ptr_type, Parameters, RefParams, NonRefParams),
<br>+
<br>+ output_export_params_ref_out(Info, Indent, MLDS_Context, Parameters, !IO),
<br>+ io.nl(!IO),
<br>+ indent_line(Indent, !IO),
<br>+ io.write_string("{\n", !IO),
<br>+ indent_line(Indent + 1, !IO),
<br>+ io.write_string("java.lang.Object[] results = ", !IO),
<br>+ write_export_call(MLDS_Name, NonRefParams, !IO),
<br>+
<br>+ ( ReturnTypes = [] ->
<br>+ FirstRefArg = 0
<br>+ ; ReturnTypes = [mlds_native_bool_type] ->
<br>+ % Semidet procedure.
<br>+ FirstRefArg = 1
<br>+ ;
<br>+ unexpected(this_file, "output_export_ref_out: unexpected ReturnTypes")
<br>+ ),
<br>+ list.foldl2(assign_ref_output(Info, Indent + 1), RefParams,
<br>+ FirstRefArg, _, !IO),
<br>+ (
<br>+ FirstRefArg = 0
<br>+ ;
<br>+ FirstRefArg = 1,
<br>+ indent_line(Indent + 1, !IO),
<br>+ Stmt = "return ((java.lang.Boolean) results[0]).booleanValue();\n",
<br>+ io.write_string(Stmt, !IO)
<br>+ ),
<br>+ indent_line(Indent, !IO),
<br>+ io.write_string("}\n", !IO).
<br>+
<br>+:- pred output_export_params_ref_out(java_out_info::in, indent::in,
<br>+ mlds_context::in, list(mlds_argument)::in, io::di, io::uo) is det.
<br>+
<br>+output_export_params_ref_out(Info, Indent, Context, Parameters, !IO) :-
<br>+ io.write_string("(", !IO),
<br>+ (
<br>+ Parameters = []
<br>+ ;
<br>+ Parameters = [_ | _],
<br>+ io.nl(!IO),
<br>+ io.write_list(Parameters, ",\n",
<br>+ output_export_param_ref_out(Info, Indent + 1, Context), !IO)
<br>+ ),
<br>+ io.write_string(")", !IO).
<br>+
<br>+:- pred output_export_param_ref_out(java_out_info::in, indent::in,
<br>+ mlds_context::in, mlds_argument::in, io::di, io::uo) is det.
<br>+
<br>+output_export_param_ref_out(Info, Indent, _Context, Argument, !IO) :-
<br>+ Argument = mlds_argument(Name, Type, _),
<br>+ indent_line(Indent, !IO),
<br>+ ( Type = mlds_ptr_type(InnerType) ->
<br>+ io.write_string("jmercury.runtime.Ref<", !IO),
<br>+ output_boxed_type(Info, InnerType, !IO),
<br>+ io.write_string("> ", !IO)
<br>+ ;
<br>+ output_type(Info, normal_style, Type, !IO),
<br>+ io.write_string(" ", !IO)
<br>+ ),
<br>+ output_name(Name, !IO).
<br>+
<br>+:- pred write_export_call(mlds_qualified_entity_name::in,
<br>+ list(mlds_argument)::in, io::di, io::uo) is det.
<br>+
<br>+write_export_call(MLDS_Name, Parameters, !IO) :-
<br> output_fully_qualified_name(MLDS_Name, !IO),
<br> io.write_char('(', !IO),
<br>- WriteCallArg = (pred(Arg::in, !.IO::di, !:IO::uo) is det :-
<br>- Arg = mlds_argument(Name, _, _),
<br>- output_name(Name, !IO)
<br>- ),
<br>- io.write_list(Parameters, ", ", WriteCallArg, !IO),
<br>- io.write_string(");\n", !IO),
<br>+ io.write_list(Parameters, ", ", write_argument_name, !IO),
<br>+ io.write_string(");\n", !IO).
<br>+
<br>+:- pred write_argument_name(mlds_argument::in, io::di, io::uo) is det.
<br>+
<br>+write_argument_name(Arg, !IO) :-
<br>+ Arg = mlds_argument(Name, _, _),
<br>+ output_name(Name, !IO).
<br>+
<br>+:- pred assign_ref_output(java_out_info::in, indent::in, mlds_argument::in,
<br>+ int::in, int::out, io::di, io::uo) is det.
<br>+
<br>+assign_ref_output(Info, Indent, Arg, N, N + 1, !IO) :-
<br>+ Arg = mlds_argument(Name, Type, _),
<br> indent_line(Indent, !IO),
<br>- io.write_string("}\n", !IO),
<br>- output_exports(Info, Indent, Exports, !IO).
<br>+ output_name(Name, !IO),
<br>+ io.write_string(".val = (", !IO),
<br>+ ( Type = mlds_ptr_type(InnerType) ->
<br>+ output_boxed_type(Info, InnerType, !IO)
<br>+ ;
<br>+ output_boxed_type(Info, Type, !IO)
<br>+ ),
<br>+ io.format(") results[%d];\n", [i(N)], !IO).
<br>+
<br>+:- pred output_boxed_type(java_out_info::in, mlds_type::in,
<br>+ io::di, io::uo) is det.
<br>+
<br>+output_boxed_type(Info, Type, !IO) :-
<br>+ ( java_builtin_type(Type, _, JavaBoxedName, _) ->
<br>+ io.write_string(JavaBoxedName, !IO)
<br>+ ;
<br>+ output_type(Info, normal_style, Type, !IO)
<br>+ ).
<br>+
<br>+:- pred has_ptr_type(mlds_argument::in) is semidet.
<br>+
<br>+has_ptr_type(mlds_argument(_, mlds_ptr_type(_), _)).
<br>
<br> %-----------------------------------------------------------------------------%
<br> %
<br>diff --git a/compiler/options.m b/compiler/options.m
<br>index 6a323a0..7a94271 100644
<br>--- a/compiler/options.m
<br>+++ b/compiler/options.m
<br>@@ -411,6 +411,9 @@
<br> ; put_commit_in_own_func
<br> ; put_nondet_env_on_heap
<br>
<br>+ % Java back-end compilation model options
<br>+ ; java_export_ref_out
<br>+
<br> % IL back-end compilation model options
<br> ; verifiable_code
<br> ; il_refany_fields
<br>@@ -1297,6 +1300,9 @@ option_defaults_2(compilation_model_option, [
<br> put_commit_in_own_func - bool(no),
<br> put_nondet_env_on_heap - bool(no),
<br>
<br>+ % Java back-end compilation model options
<br>+ java_export_ref_out - bool(no),
<br>+
<br> % IL back-end compilation model options
<br> verifiable_code - bool(no),
<br> il_funcptr_types - bool(no),
<br>@@ -2151,6 +2157,8 @@ long_option("det-copy-out", det_copy_out).
<br> long_option("nondet-copy-out", nondet_copy_out).
<br> long_option("put-commit-in-own-func", put_commit_in_own_func).
<br> long_option("put-nondet-env-on-heap", put_nondet_env_on_heap).
<br>+% Java back-end compilation model options
<br>+long_option("java-export-ref-out", java_export_ref_out).
<br> % IL back-end compilation model options
<br> long_option("verifiable-code", verifiable_code).
<br> long_option("verifiable", verifiable_code).
<br>@@ -4257,7 +4265,7 @@ options_help_compilation_model -->
<br> "\tUse an alternative higher-level data representation.",
<br> % "--high-level\t\t\t(grades: hl, hl_nest, il, java)",
<br> "--high-level\t\t\t(grades: hl, il, java)",
<br>- "\tAn abbreviation for `--high-level-code --high-level-data'."
<br>+ "\tAn abbreviation for `--high-level-code --high-level-data'.",
<br> % The --gcc-nested-functions option is not yet documented,
<br> % because it doesn't pass our test suite, and it is
<br> % probably not very useful.
<br>@@ -4296,6 +4304,9 @@ options_help_compilation_model -->
<br> % "\tnondeterministic Mercury procedures on the heap,",
<br> % "\trather than on the stack.",
<br> %
<br>+ "--java-export-ref-out",
<br>+ "\tUse pass-by-reference for exported procedures with multiple",
<br>+ "\toutput arguments."
<br> % ]),
<br> % io.write_string("\n IL back-end compilation model options:\n"),
<br> % write_tabbed_lines([
<br>diff --git a/doc/reference_manual.texi b/doc/reference_manual.texi
<br>index 9e3ddac..fbb7424 100644
<br>--- a/doc/reference_manual.texi
<br>+++ b/doc/reference_manual.texi
<br>@@ -6969,9 +6969,6 @@ the length of the array is the number of elements in the tuple.
<br> Mercury variables whose type is a type variable will be passed as
<br> @code{java.lang.Object}.
<br> Mercury array types are mapped to Java array types.
<br>-When compiling with @samp{--no-high-level-data}, all other Mercury variables
<br>-are passed as @code{java.lang.Object[]}.
<br>-When compiling with @samp{--high-level-data},
<br> Mercury variables whose type is a Mercury discriminated union type
<br> will be passed as a Java type whose type name is determined from
<br> the Mercury type name (ignoring any type parameters) followed by
<br>@@ -7000,13 +6997,20 @@ whose result has an input mode, then the Mercury function result is
<br> appended to the list of input parameters, so that the Mercury function
<br> result becomes the last parameter to the corresponding Java function.
<br>
<br>+The handling of multiple output arguments depends on the option
<br>+@samp{--java-export-ref-out}. It is disabled by default, but in the
<br>+future will become enabled by default.
<br>+
<br>+@noindent
<br>+Without @samp{--java-export-ref-out}:
<br>+
<br> The result of the Java function will be a sequence comprised of
<br> the outputs of the Mercury procedure. If the Mercury procedure's
<br> determinism indicates that it can fail, then its first output will
<br> be a @samp{boolean} success indicator, with a @samp{true} value
<br> denoting success and a @samp{false} value denoting failure. The
<br> remaining outputs will be the subsequence of the Mercury procedure's
<br>-arguments and function result (if any) that have output modes.
<br>+arguments and function result (if any) that have output modes.
<br>
<br> If the sequence has length zero then the return type of the
<br> Java function is @samp{void}.
<br>@@ -7014,7 +7018,30 @@ If the sequence has length one then the return type of the
<br> Java function is the type of the item in question.
<br> Otherwise, the Java function will return an array of type
<br> @samp{java.lang.Object[]}.
<br>-
<br>+
<br>+@noindent
<br>+With @samp{--java-export-ref-out}:
<br>+
<br>+If the Mercury procedure is deterministic and has no output arguments,
<br>+then the return type of the Java function is @samp{void}; if it has
<br>+one output argument, then the return value of the function is that
<br>+output argument.
<br>+
<br>+If the Mercury procedure is deterministic and has two or more output
<br>+arguments, then the return type of the Java function is @samp{void}.
<br>+At the position of each output argument, the Java function takes a
<br>+value of the type @samp{jmercury.runtime.Ref<T>} where @samp{T} is the
<br>+Java type corresponding to the type of the output argument.
<br>+@samp{Ref} is a class with a single field @samp{val}, which is
<br>+assigned the output value when the function returns.
<br>+
<br>+If the Mercury procedure is semi-deterministic then the Java function
<br>+returns a @samp{boolean}. A @samp{true} return value denotes success
<br>+and @samp{false} denotes failure. Output arguments are handled in the
<br>+same way as multiple outputs deterministic procedures, using the
<br>+@samp{Ref} class. On failure the values of the @samp{val} fields are
<br>+undefined.
<br>+
<br> Arguments of type @samp{io.state} or @samp{store.store(_)} are not
<br> passed or returned at all.
<br> (The reason for this is that these types represent mutable state,
<br>diff --git a/java/runtime/Ref.java b/java/runtime/Ref.java
<br>new file mode 100644
<br>index 0000000..00b07be
<br>--- /dev/null
<br>+++ b/java/runtime/Ref.java
<br>@@ -0,0 +1,14 @@
<br>+//
<br>+// Copyright (C) 2009 The University of Melbourne.
<br>+// This file may only be copied under the terms of the GNU Library General
<br>+// Public License - see the file COPYING.LIB in the Mercury distribution.
<br>+//
<br>+// This class is used in some cases to hold output values of Mercury
<br>+// procedures exported to Java.
<br>+//
<br>+
<br>+package jmercury.runtime;
<br>+
<br>+public class Ref<T> {
<br>+ public T val;
<br>+}
<br><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26523676&i=0" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26523676&i=1" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26523676&i=2" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26505515
Re: for review: gcc 4 with llds grades
2009-11-24T15:51:02Z
2009-11-24T15:51:02Z
Peter Wang-6
On 2009-11-24, Julien Fischer <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26505515&i=0" target="_top" rel="nofollow">juliensf@...</a>> wrote:
<br>> >+AC_SUBST(CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS)
<br>>
<br>> Why is CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS an output variable? Its value
<br>> is not used beyond the configure script.
<br><br>Left over from an earlier version of the patch; deleted.
<br><div class='shrinkable-quote'><br>> >@@ -2993,16 +3010,6 @@ case "$mercury_cv_user_base_grade" in
<br>> > BEST_LLDS_BASE_GRADE=none
<br>> > fi
<br>> > fi
<br>> >-
<br>> >- # Force the use of the none base grade if the C compiler
<br>> >- # is GCC 4.{1,2,3,4}. The asm_fast and reg grades either
<br>> >- # don't work or are unstable with those versions.
<br>> >- # (See bugs #39, #66 and #78 in the Mercury bug database.)
<br>> >- case "$mercury_cv_gcc_version" in
<br>> >- 4_1_*|4_2_*|4_3_*|4_4_*)
<br>> >- BEST_LLDS_BASE_GRADE=none
<br>> >- ;;
<br>> >- esac
<br>>
<br>> I suggest leaving a commented out version of the above code, so that if
<br>> the workaround needs to be applied to a future version of GCC it is
<br>> obvious how and where to do it.
</div><br>Done.
<br><br>> > /*
<br>> >+ ** This hack is to prevent gcc 4.x optimizing away stores to succip before
<br>> >+ ** jumping to a label in asm_fast.gc.
<br>>
<br>> s/asm_fast.gc/asm_fast*/
<br>>
<br>> It presumably has nothing to do with the presence or absence of garbage
<br>> collection.
<br><br>Done.
<br><br>Peter
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26505515&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26505515&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26505515&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26492696
Re: for review: gcc 4 with llds grades
2009-11-24T01:12:34Z
2009-11-24T01:12:34Z
Julien Fischer-2
<br>On Mon, 23 Nov 2009, Peter Wang wrote:
<br><br>> Make it possible to use gcc global registers and non-local gotos with gcc 4.x.
<br>>
<br>> Tested with asm_fast.gc on Linux/x86 with gcc 4.1.2, 4.2.4, 4.3.3, 4.4.2;
<br>> and on Linux/x86-64 with gcc 4.2.4.
<br>> I also did limited testing of reg.gc,
<br>> which also worked.
<br><br>We should try it on Darwin/x86 too.
<br><div class='shrinkable-quote'><br>> Some low-level C grades do not build with the current version of the compiler
<br>> so were not tested: fast.gc, jump.gc, asm_jump.gc.
<br>>
<br>> configure.in:
<br>> Check if the C compiler accepts `-fno-move-loop-invariants'.
<br>>
<br>> Add `-fno-move-loop-invariants' to gcc flags for non-local gotos.
<br>> This is enough for `asm_jump.gc' to work (tested with an earlier
<br>> version of the compiler).
<br>>
<br>> Remove code to force `none' grades with gcc 4.x.
<br>>
<br>> runtime/mercury_goto.h:
<br>> Add a hack to prevent gcc 4.x removing stores to the succip register
<br>> before a jump. Along with `-fno-move-loop-invariants', this lets
<br>> `asm_fast.gc' work.
<br>>
<br>> This hack is currently only used for the x86 and x86-64 definitions of
<br>> MR_ASM_JUMP/MR_JUMP, but is possibly required on other architectures,
<br>> too.
<br>>
<br>> runtime/RESERVED_MACRO_NAMES:
<br>> Add a macro which can be defined by gcc.
<br>>
<br>> diff --git a/configure.in b/configure.in
<br>> index 3e77a7b..10d8289 100644
<br>> --- a/configure.in
<br>> +++ b/configure.in
<br>> @@ -838,6 +838,19 @@ else
<br>> fi
<br>>
<br>> AC_SUBST(CFLAGS_FOR_NO_STRICT_ALIASING)
<br>> +
<br>> +AC_MSG_CHECKING(whether we can use -fno-move-loop-invariants)
<br>> +if $CC -O2 -Wall -fno-move-loop-invariants -c conftest.c \
<br>> + </dev/null >&AC_FD_CC 2>&1
<br>> +then
<br>> + AC_MSG_RESULT(yes)
<br>> + CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS="-fno-move-loop-invariants"
<br>> +else
<br>> + AC_MSG_RESULT(no)
<br>> + CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS=
<br>> +fi
<br>> +
<br>> +AC_SUBST(CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS)
</div><br>Why is CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS an output variable? Its value
<br>is not used beyond the configure script.
<br><br>...
<br><div class='shrinkable-quote'><br>> #-----------------------------------------------------------------------------#
<br>> @@ -2329,6 +2342,9 @@ AC_SUBST(MR_DARWIN_SETJMP_WORKAROUND)
<br>> # (Actually I don't know if `-fno-functions-cse' is really needed.
<br>> # Maybe you can get away without it. But better to err on the safe side...)
<br>> #
<br>> +# For x86, x86-64 and possibly other architectures, when using non-local
<br>> +# gotos with gcc 4.x we need `-fno-move-loop-invariants'.
<br>> +#
<br>> # For alpha, mips, and ARM, and probably on other architectures, when using
<br>> # non-local gotos we need -fomit-frame-pointer, otherwise when compiling
<br>> # with --no-c-optimize we run into a problem similar to the one above:
<br>> @@ -2359,6 +2375,7 @@ case "$ac_cv_prog_gcc" in yes)
<br>> CFLAGS_FOR_GOTOS="-fno-defer-pop -fno-function-cse -fno-gcse"
<br>> ;;
<br>> esac
<br>> + CFLAGS_FOR_GOTOS="$CFLAGS_FOR_GOTOS $CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS"
<br>> case "$host" in
<br>> mips-sgi-irix5.*)
<br>> # Non-local gotos don't work with shared libraries on Irix 5,
<br>> @@ -2993,16 +3010,6 @@ case "$mercury_cv_user_base_grade" in
<br>> BEST_LLDS_BASE_GRADE=none
<br>> fi
<br>> fi
<br>> -
<br>> - # Force the use of the none base grade if the C compiler
<br>> - # is GCC 4.{1,2,3,4}. The asm_fast and reg grades either
<br>> - # don't work or are unstable with those versions.
<br>> - # (See bugs #39, #66 and #78 in the Mercury bug database.)
<br>> - case "$mercury_cv_gcc_version" in
<br>> - 4_1_*|4_2_*|4_3_*|4_4_*)
<br>> - BEST_LLDS_BASE_GRADE=none
<br>> - ;;
<br>> - esac
</div><br>I suggest leaving a commented out version of the above code, so that if
<br>the workaround needs to be applied to a future version of GCC it is
<br>obvious how and where to do it.
<br><br>...
<br><div class='shrinkable-quote'><br>> diff --git a/runtime/mercury_goto.h b/runtime/mercury_goto.h
<br>> index 1e499d5..7a87864 100644
<br>> --- a/runtime/mercury_goto.h
<br>> +++ b/runtime/mercury_goto.h
<br>> @@ -353,6 +353,20 @@
<br>> #elif defined(__i386__) || defined(__mc68000__) || defined(__x86_64__)
<br>>
<br>> /*
<br>> + ** This hack is to prevent gcc 4.x optimizing away stores to succip before
<br>> + ** jumping to a label in asm_fast.gc.
</div><br>s/asm_fast.gc/asm_fast*/
<br><br>It presumably has nothing to do with the presence or absence of garbage
<br>collection.
<br><br>The diff looks good otherwise.
<br><br>Julien.
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26492696&i=0" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26492696&i=1" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26492696&i=2" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26492522
Re: for review: Re-factor the MR_join_and_continue macro.
2009-11-24T00:57:59Z
2009-11-24T00:57:59Z
Zoltan Somogyi-2
On 24-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26492522&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<div class='shrinkable-quote'><br>> I'm beginning to wonder if it would be best to write MR_join_and_continue as a
<br>> C function and use a macro that wraps it to avoid the stack leak as follows:
<br>>
<br>> extern MR_Code *MR_do_join_and_continue(MR_SyncTerm *sync_term);
<br>>
<br>> #define MR_join_and_continue(sync_term, join_label) \
<br>> do { \
<br>> MR_Code *jump_target; \
<br>> jump_target = MR_do_join_and_continue(sync_term); \
<br>> if (jump_target) { \
<br>> MR_GOTO(jump_target); \
<br>> } else { \
<br>> MR_GOTO(join_label); \
<br>> } \
<br>> }
</div><br>That is exactly the technique we use for calling the debugger; it works well.
<br>I think that is the approach you should use.
<br><br>Zoltan.
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26492522&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26492522&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26492522&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26490573
Re: for review: gcc 4 with llds grades
2009-11-23T21:08:36Z
2009-11-23T21:08:36Z
Peter Wang-6
On 2009-11-24, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26490573&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<div class='shrinkable-quote'><br>> On Mon, Nov 23, 2009 at 05:51:40PM +1100, Peter Wang wrote:
<br>> > Branches: main
<br>> >
<br>> > Make it possible to use gcc global registers and non-local gotos with gcc 4.x.
<br>> >
<br>> > Tested with asm_fast.gc on Linux/x86 with gcc 4.1.2, 4.2.4, 4.3.3, 4.4.2;
<br>> > and on Linux/x86-64 with gcc 4.2.4. I also did limited testing of reg.gc,
<br>> > which also worked.
<br>>
<br>> Could you please do some more testing on Linux/x86-64. The GCC 4 related
<br>> problems seem to be exasabated on this achitecture.
</div><br>Bootchecked with gcc 4.1.3 and 4.3.3 on x86-64 (neptune) as well.
<br><br>Peter
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26490573&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26490573&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26490573&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26488941
Re: for review: gcc 4 with llds grades
2009-11-23T17:04:57Z
2009-11-23T17:04:57Z
Paul Bone
On Mon, Nov 23, 2009 at 05:51:40PM +1100, Peter Wang wrote:
<br>> Branches: main
<br>>
<br>> Make it possible to use gcc global registers and non-local gotos with gcc 4.x.
<br>>
<br>> Tested with asm_fast.gc on Linux/x86 with gcc 4.1.2, 4.2.4, 4.3.3, 4.4.2;
<br>> and on Linux/x86-64 with gcc 4.2.4. I also did limited testing of reg.gc,
<br>> which also worked.
<br><br>Could you please do some more testing on Linux/x86-64. The GCC 4 related
<br>problems seem to be exasabated on this achitecture. If you need any testing
<br>environments or access to more versions of GCC and Linux let us know. We can
<br>setup virtual machines to help with this.
<br><br>I'll review the patch later.
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26488941/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26488289
Re: for review: Re-factor the MR_join_and_continue macro.
2009-11-23T15:51:26Z
2009-11-23T15:51:26Z
Paul Bone
On Mon, Nov 23, 2009 at 11:39:31PM +1100, Zoltan Somogyi wrote:
<div class='shrinkable-quote'><div class='shrinkable-quote'><br>> On 23-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26488289&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> > compiler/par_conj_gen.m:
<br>> > Modified the generation of the join and continue code. This now includes
<br>> > instructions for saving a pointer to the synchronization term into MR_r1,
<br>> > before calling MR_join_and_continue.
<br>> > Added an XXX: How to I tell the low-level backend that I will clobber MR_r1
<br>> > and MR_succip? Could someone familiar with the low-level backend help me?
<br>>
<br>> That kind of problem is what I meant when I said that implementing this as a
<br>> call would be harder than fixing the macro.
</div></div>Yes, I thought so.
<br><div class='shrinkable-quote'><div class='shrinkable-quote'><br>> You shouldn't have to clear other needed values of r1; you should have
<br>> *reserved* r1 earlier, before anything else gets put in it. Since you didn't,
<br>> you can move the value in r1 to a stack slot, using the predicates in
<br>> var_locn.m (which are well commented, and which are usually accessed through
<br>> their wrapper predicates in code_info.m), but since what you want is
<br>> effectively a call to a builtin predicate, you should instead either (a)
<br>> implement the call as a HLDS-to-HLDS transform in an earlier compiler pass,
<br>> or (b) use the infrastructure that already exists in call_gen.m to generate
<br>> the code for the call at code generation time. (a) seems to me to be
<br>> preferable.
</div></div>I like the HLDS to HLDS idea as it keeps the backend simple (and is backend
<br>independent). Although, the HLDS works on a representation of a logic program,
<br>therefore a whole parallel conjunction would have to be transformed into
<br>something else. I'm not sure what that 'something else' should be since I don't
<br>think we have any HLDS structures that can represent the execution flow of a
<br>parallel conjunction.
<br><br>Doing this at a HLDS to LLDS stage therefore seems better. But I'm not sure
<br>that an LLDS call instruction is considered to have the right operational
<br>semantics. If join_and_continue is a call then the join label can be assumed
<br>to be a continuation label. But not very call to MR_join_and_continue will
<br>return (jump to the join label) only the last to be executed in the conjunction
<br>(not necessary the rightmost conjunct). The LLDS call instruction might still
<br>be suitable, but it's not an ideal match.
<br><br>The other benefit of doing this at code generation time will be that it will
<br>be easier to implement parallel conjunctions for the high level C backend by
<br>using blocks and GCD.
<br><br>I'm beginning to wonder if it would be best to write MR_join_and_continue as a
<br>C function and use a macro that wraps it to avoid the stack leak as follows:
<br><br>extern MR_Code *MR_do_join_and_continue(MR_SyncTerm *sync_term);
<br><br>#define MR_join_and_continue(sync_term, join_label) \
<br> do { \
<br> MR_Code *jump_target; \
<br> jump_target = MR_do_join_and_continue(sync_term); \
<br> if (jump_target) { \
<br> MR_GOTO(jump_target); \
<br> } else { \
<br> MR_GOTO(join_label); \
<br> } \
<br> }
<br><br>Well, this already looks remarkably simple in comparison! It also avoids a
<br>computed GOTO when it should jump to the join label (at the cost of the
<br>if-then-else).
<br><br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26488289/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26477372
Re: for review: Re-factor the MR_join_and_continue macro.
2009-11-23T04:39:31Z
2009-11-23T04:39:31Z
Zoltan Somogyi-2
On 23-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26477372&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> compiler/par_conj_gen.m:
<br>> Modified the generation of the join and continue code. This now includes
<br>> instructions for saving a pointer to the synchronization term into MR_r1,
<br>> before calling MR_join_and_continue.
<br>> Added an XXX: How to I tell the low-level backend that I will clobber MR_r1
<br>> and MR_succip? Could someone familiar with the low-level backend help me?
<br><br>That kind of problem is what I meant when I said that implementing this as a
<br>call would be harder than fixing the macro.
<br><br>You shouldn't have to clear other needed values of r1; you should have
<br>*reserved* r1 earlier, before anything else gets put in it. Since you didn't,
<br>you can move the value in r1 to a stack slot, using the predicates in
<br>var_locn.m (which are well commented, and which are usually accessed through
<br>their wrapper predicates in code_info.m), but since what you want is
<br>effectively a call to a builtin predicate, you should instead either (a)
<br>implement the call as a HLDS-to-HLDS transform in an earlier compiler pass,
<br>or (b) use the infrastructure that already exists in call_gen.m to generate
<br>the code for the call at code generation time. (a) seems to me to be
<br>preferable.
<br><br>I haven't looked at the diff yet, since I have a really slow connection
<br>and a small screen, but based on the misunderstanding above, I don't think
<br>the diff is ready for review yet anyway.
<br><br>Zoltan.
<br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26477372&i=1" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26477372&i=2" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26477372&i=3" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26473465
for review: gcc 4 with llds grades
2009-11-22T22:51:40Z
2009-11-22T22:51:40Z
Peter Wang-6
Branches: main
<br><br>Make it possible to use gcc global registers and non-local gotos with gcc 4.x.
<br><br>Tested with asm_fast.gc on Linux/x86 with gcc 4.1.2, 4.2.4, 4.3.3, 4.4.2;
<br>and on Linux/x86-64 with gcc 4.2.4. I also did limited testing of reg.gc,
<br>which also worked.
<br><br>Some low-level C grades do not build with the current version of the compiler
<br>so were not tested: fast.gc, jump.gc, asm_jump.gc.
<br><br>configure.in:
<br> Check if the C compiler accepts `-fno-move-loop-invariants'.
<br><br> Add `-fno-move-loop-invariants' to gcc flags for non-local gotos.
<br> This is enough for `asm_jump.gc' to work (tested with an earlier
<br> version of the compiler).
<br><br> Remove code to force `none' grades with gcc 4.x.
<br><br>runtime/mercury_goto.h:
<br> Add a hack to prevent gcc 4.x removing stores to the succip register
<br> before a jump. Along with `-fno-move-loop-invariants', this lets
<br> `asm_fast.gc' work.
<br><br> This hack is currently only used for the x86 and x86-64 definitions of
<br> MR_ASM_JUMP/MR_JUMP, but is possibly required on other architectures,
<br> too.
<br><br>runtime/RESERVED_MACRO_NAMES:
<br> Add a macro which can be defined by gcc.
<br><br>diff --git a/configure.in b/configure.in
<br>index 3e77a7b..10d8289 100644
<br>--- a/configure.in
<br>+++ b/configure.in
<br>@@ -838,6 +838,19 @@ else
<br> fi
<br>
<br> AC_SUBST(CFLAGS_FOR_NO_STRICT_ALIASING)
<br>+
<br>+AC_MSG_CHECKING(whether we can use -fno-move-loop-invariants)
<br>+if $CC -O2 -Wall -fno-move-loop-invariants -c conftest.c \
<br>+ </dev/null >&AC_FD_CC 2>&1
<br>+then
<br>+ AC_MSG_RESULT(yes)
<br>+ CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS="-fno-move-loop-invariants"
<br>+else
<br>+ AC_MSG_RESULT(no)
<br>+ CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS=
<br>+fi
<br>+
<br>+AC_SUBST(CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS)
<br> rm -f conftest*
<br>
<br> #-----------------------------------------------------------------------------#
<br>@@ -2329,6 +2342,9 @@ AC_SUBST(MR_DARWIN_SETJMP_WORKAROUND)
<br> # (Actually I don't know if `-fno-functions-cse' is really needed.
<br> # Maybe you can get away without it. But better to err on the safe side...)
<br> #
<br>+# For x86, x86-64 and possibly other architectures, when using non-local
<br>+# gotos with gcc 4.x we need `-fno-move-loop-invariants'.
<br>+#
<br> # For alpha, mips, and ARM, and probably on other architectures, when using
<br> # non-local gotos we need -fomit-frame-pointer, otherwise when compiling
<br> # with --no-c-optimize we run into a problem similar to the one above:
<br>@@ -2359,6 +2375,7 @@ case "$ac_cv_prog_gcc" in yes)
<br> CFLAGS_FOR_GOTOS="-fno-defer-pop -fno-function-cse -fno-gcse"
<br> ;;
<br> esac
<br>+ CFLAGS_FOR_GOTOS="$CFLAGS_FOR_GOTOS $CFLAGS_FOR_NO_MOVE_LOOP_INVARIANTS"
<br> case "$host" in
<br> mips-sgi-irix5.*)
<br> # Non-local gotos don't work with shared libraries on Irix 5,
<br>@@ -2993,16 +3010,6 @@ case "$mercury_cv_user_base_grade" in
<br> BEST_LLDS_BASE_GRADE=none
<br> fi
<br> fi
<br>-
<br>- # Force the use of the none base grade if the C compiler
<br>- # is GCC 4.{1,2,3,4}. The asm_fast and reg grades either
<br>- # don't work or are unstable with those versions.
<br>- # (See bugs #39, #66 and #78 in the Mercury bug database.)
<br>- case "$mercury_cv_gcc_version" in
<br>- 4_1_*|4_2_*|4_3_*|4_4_*)
<br>- BEST_LLDS_BASE_GRADE=none
<br>- ;;
<br>- esac
<br> ;;
<br> esac
<br>
<br>diff --git a/runtime/RESERVED_MACRO_NAMES b/runtime/RESERVED_MACRO_NAMES
<br>index 9a65cc6..b1097b1 100644
<br>--- a/runtime/RESERVED_MACRO_NAMES
<br>+++ b/runtime/RESERVED_MACRO_NAMES
<br>@@ -67,6 +67,7 @@ sigcontext_struct
<br> _GNU_SOURCE
<br> __EXTENSIONS__
<br> __OPTIMIZE__
<br>+__GCC_HAVE_DWARF2_CFI_ASM
<br> #-----------------------------------------------------------------------------#
<br> # These are defined in when threads are enabled.
<br> _REENTRANT
<br>diff --git a/runtime/mercury_goto.h b/runtime/mercury_goto.h
<br>index 1e499d5..7a87864 100644
<br>--- a/runtime/mercury_goto.h
<br>+++ b/runtime/mercury_goto.h
<br>@@ -353,6 +353,20 @@
<br> #elif defined(__i386__) || defined(__mc68000__) || defined(__x86_64__)
<br>
<br> /*
<br>+ ** This hack is to prevent gcc 4.x optimizing away stores to succip before
<br>+ ** jumping to a label in asm_fast.gc.
<br>+ */
<br>+ #if defined(MR_USE_GCC_GLOBAL_REGISTERS)
<br>+ #define MR_FORCE_SUCCIP_STORE \
<br>+ __asm__ __volatile__("" \
<br>+ : "=r"(MR_succip_word) \
<br>+ : "0"(MR_succip_word) \
<br>+ )
<br>+ #else
<br>+ #define MR_FORCE_SUCCIP_STORE (void)
<br>+ #endif
<br>+
<br>+ /*
<br> ** The following hack works around a stack leak on the i386.
<br> ** (and apparently the 68000 and x86_64 too).
<br> **
<br>@@ -380,11 +394,13 @@
<br> #define MR_ASM_JUMP(label) \
<br> { register int stack_pointer __asm__("esp"); \
<br> __asm__("" : : "g"(stack_pointer)); } \
<br>+ MR_FORCE_SUCCIP_STORE; \
<br> goto *(label)
<br> #elif defined(__x86_64__)
<br> #define MR_ASM_JUMP(label) \
<br> { register int stack_pointer __asm__("rsp"); \
<br> __asm__("" : : "g"(stack_pointer)); } \
<br>+ MR_FORCE_SUCCIP_STORE; \
<br> goto *(label)
<br> #elif defined(__mc68000__)
<br> #define MR_ASM_JUMP(label) \
<br><br>--------------------------------------------------------------------------
<br>mercury-reviews mailing list
<br>Post messages to: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26473465&i=0" target="_top" rel="nofollow">mercury-reviews@...</a>
<br>Administrative Queries: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26473465&i=1" target="_top" rel="nofollow">owner-mercury-reviews@...</a>
<br>Subscriptions: <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26473465&i=2" target="_top" rel="nofollow">mercury-reviews-request@...</a>
<br>--------------------------------------------------------------------------
<br><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26472184
for review: Re-factor the MR_join_and_continue macro.
2009-11-22T19:09:01Z
2009-11-22T19:09:01Z
Paul Bone
<br>For review by someone familiar with the low-level C backend, probably Zoltan.
<br><br> - Thanks, Paul.
<br><br>Re-factor the MR_join_and_continue macro.
<br><br>This change replaces the MR_join_and_continue macro with a Mercury C procedure.
<br>This macro is used in the implementation of parallel conjunctions in the low
<br>level C grades. This means that this code will always be a procedure call
<br>rather than always being in-lined.
<br><br>This change also required changes to the compiler, namely in the hlds->llds
<br>and llds->C transformations for parallel conjunctions.
<br><br>runtime/mercury_context.h:
<br>runtime/mercury_context.c:
<br> Created MR_do_join_and_continue procedure from old MR_join_and_continue
<br> macro.
<br> Created a new macro MR_join_and_continue that wraps the new procedure.
<br> Added additional comments to this procedure, describing how it works.
<br><br>compiler/llds.m:
<br> Modified the LLDS data structure:
<br> Removed the synchronization term parameter from the join_and_continue
<br> instruction.
<br> Added a new memory reference, one can now address data on the parent
<br> context's stack.
<br><br>compiler/par_conj_gen.m:
<br> Modified the generation of the join and continue code. This now includes
<br> instructions for saving a pointer to the synchronization term into MR_r1,
<br> before calling MR_join_and_continue.
<br> Added an XXX: How to I tell the low-level backend that I will clobber MR_r1
<br> and MR_succip? Could someone familiar with the low-level backend help me?
<br><br>compiler/llds_out_data.m:
<br> Generate code for taking the address of something on the parent context's
<br> stack.
<br><br>compiler/llds_out_instr.m:
<br> Alter the code generation for the join_and_continue instruction.
<br><br>compiler/opt_util.m:
<br> Conform to changes in llds.m.
<br> Introduced an XXX: I don't know if join_and_continue use livevals. Can
<br> someone familiar with this part of the compiler advise me?
<br><br>compiler/code_util.m:
<br>compiler/dupelim.m:
<br>compiler/dupproc.m:
<br>compiler/exprn_aux.m:
<br>compiler/global_data.m:
<br>compiler/jumpopt.m:
<br>compiler/livemap.m:
<br>compiler/llds_out_file.m:
<br>compiler/llds_to_x86_64.m:
<br>compiler/middle_rec.m:
<br>compiler/opt_debug.m:
<br>compiler/opt_util.m:
<br>compiler/reassign.m:
<br>compiler/use_local_vars.m:
<br>compiler/var_locn.m:
<br> Conform to changes in llds.m
<br> In some cases code has been re-factored to factor out code common to a
<br> number of switch arms.
<br><br>Index: compiler/code_util.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/code_util.m,v
<br>retrieving revision 1.186
<br>diff -u -p -b -r1.186 code_util.m
<br>--- compiler/code_util.m 30 Oct 2009 03:33:12 -0000 1.186
<br>+++ compiler/code_util.m 20 Nov 2009 10:30:53 -0000
<br>@@ -383,6 +383,7 @@ lvals_in_lval(global_var_ref(_)) = [].
<br> :- func lvals_in_mem_ref(mem_ref) = list(lval).
<br>
<br> lvals_in_mem_ref(stackvar_ref(Rval)) = lvals_in_rval(Rval).
<br>+lvals_in_mem_ref(parent_stackvar_ref(Rval)) = lvals_in_rval(Rval).
<br> lvals_in_mem_ref(framevar_ref(Rval)) = lvals_in_rval(Rval).
<br> lvals_in_mem_ref(heap_ref(Rval1, _, Rval2)) =
<br> lvals_in_rval(Rval1) ++ lvals_in_rval(Rval2).
<br>Index: compiler/dupelim.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/dupelim.m,v
<br>retrieving revision 1.94
<br>diff -u -p -b -r1.94 dupelim.m
<br>--- compiler/dupelim.m 21 Oct 2009 06:36:18 -0000 1.94
<br>+++ compiler/dupelim.m 22 Nov 2009 00:19:54 -0000
<br>@@ -425,10 +425,6 @@ standardize_instr(Instr0, Instr) :-
<br> standardize_lval(Lval0, Lval),
<br> Instr = init_sync_term(Lval, N)
<br> ;
<br>- Instr0 = join_and_continue(Lval0, Label),
<br>- standardize_lval(Lval0, Lval),
<br>- Instr = join_and_continue(Lval, Label)
<br>- ;
<br> ( Instr0 = comment(_)
<br> ; Instr0 = livevals(_)
<br> ; Instr0 = block(_, _, _)
<br>@@ -447,6 +443,7 @@ standardize_instr(Instr0, Instr) :-
<br> ; Instr0 = decr_sp_and_return(_)
<br> ; Instr0 = fork_new_child(_, _)
<br> ; Instr0 = foreign_proc_code(_, _, _, _, _, _, _, _, _, _)
<br>+ ; Instr0 = join_and_continue(_)
<br> ),
<br> Instr = Instr0
<br> ).
<br>@@ -836,7 +833,7 @@ most_specific_instr(InstrA, InstrB, Mayb
<br> ; InstrA = foreign_proc_code(_, _, _, _, _, _, _, _, _, _)
<br> ; InstrA = fork_new_child(_, _)
<br> ; InstrA = init_sync_term(_, _)
<br>- ; InstrA = join_and_continue(_, _)
<br>+ ; InstrA = join_and_continue(_)
<br> ),
<br> ( InstrA = InstrB ->
<br> MaybeInstr = yes(InstrA)
<br>Index: compiler/dupproc.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/dupproc.m,v
<br>retrieving revision 1.25
<br>diff -u -p -b -r1.25 dupproc.m
<br>--- compiler/dupproc.m 21 Oct 2009 06:36:18 -0000 1.25
<br>+++ compiler/dupproc.m 22 Nov 2009 00:20:38 -0000
<br>@@ -226,9 +226,9 @@ standardize_instr(Instr, StdInstr, DupPr
<br> standardize_label(Child, StdChild, DupProcMap),
<br> StdInstr = fork_new_child(Lval, StdChild)
<br> ;
<br>- Instr = join_and_continue(Lval, Label),
<br>+ Instr = join_and_continue(Label),
<br> standardize_label(Label, StdLabel, DupProcMap),
<br>- StdInstr = join_and_continue(Lval, StdLabel)
<br>+ StdInstr = join_and_continue(StdLabel)
<br> ;
<br> % The labels occurring in foreign_proc_code instructions
<br> % cannot be substituted.
<br>Index: compiler/exprn_aux.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/exprn_aux.m,v
<br>retrieving revision 1.90
<br>diff -u -p -b -r1.90 exprn_aux.m
<br>--- compiler/exprn_aux.m 30 Oct 2009 03:33:13 -0000 1.90
<br>+++ compiler/exprn_aux.m 22 Nov 2009 00:21:31 -0000
<br>@@ -234,6 +234,8 @@ vars_in_lval(lvar(Var), [Var]).
<br>
<br> vars_in_mem_ref(stackvar_ref(Rval), Vars) :-
<br> vars_in_rval(Rval, Vars).
<br>+vars_in_mem_ref(parent_stackvar_ref(Rval), Vars) :-
<br>+ vars_in_rval(Rval, Vars).
<br> vars_in_mem_ref(framevar_ref(Rval), Vars) :-
<br> vars_in_rval(Rval, Vars).
<br> vars_in_mem_ref(heap_ref(BaseRval, _Tag, FieldRval), BaseVars ++ FieldVars) :-
<br>@@ -263,6 +265,7 @@ transform_lval_in_uinstr(Transform, Uins
<br> ; Uinstr0 = decr_sp(_)
<br> ; Uinstr0 = decr_sp_and_return(_)
<br> ; Uinstr0 = fork_new_child(_, _)
<br>+ ; Uinstr0 = join_and_continue(_)
<br> ),
<br> Uinstr = Uinstr0
<br> ;
<br>@@ -404,10 +407,6 @@ transform_lval_in_uinstr(Transform, Uins
<br> Uinstr0 = init_sync_term(Lval0, BranchCount),
<br> Transform(Lval0, Lval, !Acc),
<br> Uinstr = init_sync_term(Lval, BranchCount)
<br>- ;
<br>- Uinstr0 = join_and_continue(Lval0, Label),
<br>- Transform(Lval0, Lval, !Acc),
<br>- Uinstr = join_and_continue(Lval, Label)
<br> ).
<br>
<br> :- pred transform_lval_in_component(transform_lval(T)::in(transform_lval),
<br>@@ -514,6 +513,10 @@ transform_lval_in_mem_ref(Transform, Mem
<br> transform_lval_in_rval(Transform, Rval0, Rval, !Acc),
<br> MemRef = stackvar_ref(Rval)
<br> ;
<br>+ MemRef0 = parent_stackvar_ref(Rval0),
<br>+ transform_lval_in_rval(Transform, Rval0, Rval, !Acc),
<br>+ MemRef = parent_stackvar_ref(Rval)
<br>+ ;
<br> MemRef0 = framevar_ref(Rval0),
<br> transform_lval_in_rval(Transform, Rval0, Rval, !Acc),
<br> MemRef = framevar_ref(Rval)
<br>@@ -643,6 +646,9 @@ substitute_rval_in_mem_ref(OldRval, NewR
<br> MemRef0 = stackvar_ref(N),
<br> MemRef = stackvar_ref(N)
<br> ;
<br>+ MemRef0 = parent_stackvar_ref(N),
<br>+ MemRef = parent_stackvar_ref(N)
<br>+ ;
<br> MemRef0 = framevar_ref(N),
<br> MemRef = framevar_ref(N)
<br> ;
<br>@@ -870,6 +876,7 @@ lval_list_addrs([Lval | Lvals], CodeAddr
<br> list(code_addr)::out, list(data_id)::out) is det.
<br>
<br> mem_ref_addrs(stackvar_ref(_SlotNum), [], []).
<br>+mem_ref_addrs(parent_stackvar_ref(_SlotNum), [], []).
<br> mem_ref_addrs(framevar_ref(_SlotNum), [], []).
<br> mem_ref_addrs(heap_ref(Rval, _Tag, _FieldNum), CodeAddrs, DataIds) :-
<br> rval_addrs(Rval, CodeAddrs, DataIds).
<br>Index: compiler/global_data.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/global_data.m,v
<br>retrieving revision 1.43
<br>diff -u -p -b -r1.43 global_data.m
<br>--- compiler/global_data.m 30 Oct 2009 03:33:13 -0000 1.43
<br>+++ compiler/global_data.m 22 Nov 2009 00:22:11 -0000
<br>@@ -1020,10 +1020,6 @@ remap_instr(Remap, Instr0, Instr) :-
<br> remap_lval(Remap, Lval0, Lval),
<br> Instr = init_sync_term(Lval, NumJoins)
<br> ;
<br>- Instr0 = join_and_continue(Lval0, Label),
<br>- remap_lval(Remap, Lval0, Lval),
<br>- Instr = join_and_continue(Lval, Label)
<br>- ;
<br> ( Instr0 = comment(_)
<br> ; Instr0 = livevals(_)
<br> ; Instr0 = llcall(_, _, _, _, _, _)
<br>@@ -1037,6 +1033,7 @@ remap_instr(Remap, Instr0, Instr) :-
<br> ; Instr0 = decr_sp(_)
<br> ; Instr0 = decr_sp_and_return(_)
<br> ; Instr0 = fork_new_child(_, _)
<br>+ ; Instr0 = join_and_continue(_)
<br> ),
<br> Instr = Instr0
<br> ).
<br>@@ -1196,6 +1193,7 @@ remap_rval_const(Remap, Const0, Const) :
<br> remap_mem_ref(Remap, MemRef0, MemRef) :-
<br> (
<br> ( MemRef0 = stackvar_ref(_)
<br>+ ; MemRef0 = parent_stackvar_ref(_)
<br> ; MemRef0 = framevar_ref(_)
<br> ),
<br> MemRef = MemRef0
<br>Index: compiler/jumpopt.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/jumpopt.m,v
<br>retrieving revision 1.112
<br>diff -u -p -b -r1.112 jumpopt.m
<br>--- compiler/jumpopt.m 21 Oct 2009 06:36:19 -0000 1.112
<br>+++ compiler/jumpopt.m 22 Nov 2009 00:23:22 -0000
<br>@@ -798,12 +798,12 @@ jump_opt_instr_list([Instr0 | Instrs0],
<br> NewRemain = specified([Instr], Instrs0)
<br> )
<br> ;
<br>- Uinstr0 = join_and_continue(SyncTerm, Label0),
<br>+ Uinstr0 = join_and_continue(Label0),
<br> short_label(Instrmap, Label0, Label),
<br> ( Label = Label0 ->
<br> NewRemain = usual_case
<br> ;
<br>- Uinstr = join_and_continue(SyncTerm, Label),
<br>+ Uinstr = join_and_continue(Label),
<br> Comment = Comment0 ++ " (redirect)",
<br> Instr = llds_instr(Uinstr, Comment),
<br> NewRemain = specified([Instr], Instrs0)
<br>Index: compiler/livemap.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/livemap.m,v
<br>retrieving revision 1.93
<br>diff -u -p -b -r1.93 livemap.m
<br>--- compiler/livemap.m 21 Oct 2009 06:36:19 -0000 1.93
<br>+++ compiler/livemap.m 22 Nov 2009 00:27:54 -0000
<br>@@ -350,7 +350,7 @@ livemap_do_build_instr(Instr0, !Instrs,
<br> ;
<br> Uinstr0 = fork_new_child(_, _)
<br> ;
<br>- Uinstr0 = join_and_continue(_, _)
<br>+ Uinstr0 = join_and_continue(_)
<br> ;
<br> Uinstr0 = arbitrary_c_code(AffectsLiveness, LiveLvalInfo, Code),
<br> build_live_lval_info(AffectsLiveness, LiveLvalInfo, Code,
<br>@@ -523,6 +523,8 @@ make_live_in_rval(mem_addr(MemRef), !Liv
<br>
<br> make_live_in_mem_ref(stackvar_ref(Rval), !Live) :-
<br> make_live_in_rval(Rval, !Live).
<br>+make_live_in_mem_ref(parent_stackvar_ref(Rval), !Live) :-
<br>+ make_live_in_rval(Rval, !Live).
<br> make_live_in_mem_ref(framevar_ref(Rval), !Live) :-
<br> make_live_in_rval(Rval, !Live).
<br> make_live_in_mem_ref(heap_ref(Rval1, _, Rval2), !Live) :-
<br>Index: compiler/llds.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/llds.m,v
<br>retrieving revision 1.365
<br>diff -u -p -b -r1.365 llds.m
<br>--- compiler/llds.m 30 Oct 2009 03:33:14 -0000 1.365
<br>+++ compiler/llds.m 22 Nov 2009 10:33:18 -0000
<br>@@ -621,13 +621,15 @@
<br> % the synchronisation term. Control continues at the next
<br> % instruction.
<br>
<br>- ; join_and_continue(lval, label).
<br>+ ; join_and_continue(label).
<br> % Signal that this thread of execution has finished in the current
<br> % parallel conjunct. For details of how we at the end of a parallel
<br>- % conjunct see runtime/mercury_context.{c,h}.
<br>- % The synchronisation term is specified by the given lval.
<br>- % The label gives the address of the code following the parallel
<br>- % conjunction.
<br>+ % conjunct see runtime/mercury_context.{c,h}. The value in MR_r1
<br>+ % points to The synchronisation term. The label gives the address
<br>+ % of the code following the parallel conjunction. The
<br>+ % MR_join_and_continue macro loads the address of the label into
<br>+ % MR_succip before jumping to the implementation of
<br>+ % MR_do_join_and_continue.
<br>
<br> :- type stack_incr_kind
<br> ---> stack_incr_leaf % The incr_sp creates the stack frame
<br>@@ -1129,8 +1131,9 @@
<br> % stack.
<br>
<br> :- type mem_ref
<br>- ---> stackvar_ref(rval) % Stack slot number.
<br>- ; framevar_ref(rval) % Stack slot number.
<br>+ ---> stackvar_ref(rval) % Det stack slot number.
<br>+ ; parent_stackvar_ref(rval) % Parent's det stack slot number.
<br>+ ; framevar_ref(rval) % Nondet stack slot number.
<br> ; heap_ref(rval, int, rval). % The cell pointer, the tag to
<br> % subtract, and the field number.
<br>
<br>Index: compiler/llds_out_data.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/llds_out_data.m,v
<br>retrieving revision 1.1
<br>diff -u -p -b -r1.1 llds_out_data.m
<br>--- compiler/llds_out_data.m 4 Nov 2009 03:44:48 -0000 1.1
<br>+++ compiler/llds_out_data.m 20 Nov 2009 10:52:12 -0000
<br>@@ -756,6 +756,7 @@ output_record_mem_ref_decls_format(Info,
<br> !N, !DeclSet, !IO) :-
<br> (
<br> ( MemRef = stackvar_ref(Rval)
<br>+ ; MemRef = parent_stackvar_ref(Rval)
<br> ; MemRef = framevar_ref(Rval)
<br> ),
<br> output_record_rval_decls_format(Info, Rval,
<br>@@ -957,18 +958,16 @@ output_rval(Info, Rval, !IO) :-
<br> ;
<br> Rval = mem_addr(MemRef),
<br> (
<br>+ (
<br> MemRef = stackvar_ref(SubRval),
<br>- io.write_string("&MR_sv(", !IO),
<br>- % Don't clutter the output with unnecessary casts.
<br>- ( SubRval = const(llconst_int(SlotNum)) ->
<br>- io.write_int(SlotNum, !IO)
<br>+ io.write_string("&MR_sv(", !IO)
<br> ;
<br>- output_rval_as_type(Info, SubRval, lt_integer, !IO)
<br>- ),
<br>- io.write_string(")", !IO)
<br>+ MemRef = parent_stackvar_ref(SubRval),
<br>+ io.write_string("&MR_parent_sv(", !IO)
<br> ;
<br> MemRef = framevar_ref(SubRval),
<br>- io.write_string("&MR_fv(", !IO),
<br>+ io.write_string("&MR_fv(", !IO)
<br>+ ),
<br> % Don't clutter the output with unnecessary casts.
<br> ( SubRval = const(llconst_int(SlotNum)) ->
<br> io.write_int(SlotNum, !IO)
<br>Index: compiler/llds_out_file.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/llds_out_file.m,v
<br>retrieving revision 1.1
<br>diff -u -p -b -r1.1 llds_out_file.m
<br>--- compiler/llds_out_file.m 4 Nov 2009 03:44:48 -0000 1.1
<br>+++ compiler/llds_out_file.m 22 Nov 2009 00:28:30 -0000
<br>@@ -1134,7 +1134,7 @@ find_cont_labels([Instr | Instrs], !Cont
<br> ;
<br> Uinstr = mkframe(_, yes(code_label(ContLabel)))
<br> ;
<br>- Uinstr = join_and_continue(_, ContLabel)
<br>+ Uinstr = join_and_continue(ContLabel)
<br> ;
<br> Uinstr = assign(redoip_slot(_), const(Const)),
<br> Const = llconst_code_addr(code_label(ContLabel))
<br>Index: compiler/llds_out_instr.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/llds_out_instr.m,v
<br>retrieving revision 1.1
<br>diff -u -p -b -r1.1 llds_out_instr.m
<br>--- compiler/llds_out_instr.m 4 Nov 2009 03:44:48 -0000 1.1
<br>+++ compiler/llds_out_instr.m 22 Nov 2009 00:38:03 -0000
<br>@@ -233,8 +233,7 @@ output_record_instr_decls(Info, Instr, !
<br> output_record_lval_decls(Info, Lval, !DeclSet, !IO),
<br> output_record_code_addr_decls(Info, code_label(Child), !DeclSet, !IO)
<br> ;
<br>- Instr = join_and_continue(Lval, Label),
<br>- output_record_lval_decls(Info, Lval, !DeclSet, !IO),
<br>+ Instr = join_and_continue(Label),
<br> output_record_code_addr_decls(Info, code_label(Label), !DeclSet, !IO)
<br> ).
<br>
<br>@@ -905,10 +904,8 @@ output_instruction(Info, Instr, ProfInfo
<br> output_label_as_code_addr(Child, !IO),
<br> io.write_string(");\n", !IO)
<br> ;
<br>- Instr = join_and_continue(Lval, Label),
<br>+ Instr = join_and_continue(Label),
<br> io.write_string("\tMR_join_and_continue(", !IO),
<br>- output_lval(Info, Lval, !IO),
<br>- io.write_string(", ", !IO),
<br> output_label_as_code_addr(Label, !IO),
<br> io.write_string(");\n", !IO)
<br> ).
<br>Index: compiler/llds_to_x86_64.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/llds_to_x86_64.m,v
<br>retrieving revision 1.13
<br>diff -u -p -b -r1.13 llds_to_x86_64.m
<br>--- compiler/llds_to_x86_64.m 4 Nov 2009 03:44:48 -0000 1.13
<br>+++ compiler/llds_to_x86_64.m 22 Nov 2009 00:29:49 -0000
<br>@@ -438,7 +438,7 @@ instr_to_x86_64(!RegMap, init_sync_term(
<br> Instr = [x86_64_comment("<<init_sync_term>>")].
<br> instr_to_x86_64(!RegMap, fork_new_child(_, _), Instr) :-
<br> Instr = [x86_64_comment("<<fork_new_child>>")].
<br>-instr_to_x86_64(!RegMap, join_and_continue(_, _), Instr) :-
<br>+instr_to_x86_64(!RegMap, join_and_continue(_), Instr) :-
<br> Instr = [x86_64_comment("<<join_and_continue>>")].
<br>
<br> % Transform lval into either an x86_64 operand or x86_64 instructions.
<br>@@ -700,6 +700,8 @@ transform_rval(!RegMap, binop(Op, Rval1,
<br> ).
<br> transform_rval(!RegMap, mem_addr(stackvar_ref(Rval)), Op, no) :-
<br> transform_rval(!RegMap, Rval, Op, _).
<br>+transform_rval(!RegMap, mem_addr(parent_stackvar_ref(Rval)), Op, no) :-
<br>+ transform_rval(!RegMap, Rval, Op, _).
<br> transform_rval(!RegMap, mem_addr(framevar_ref(Rval)), Op, no) :-
<br> transform_rval(!RegMap, Rval, Op, _).
<br> transform_rval(!RegMap, mem_addr(heap_ref(Rval1, Tag, Rval2)), no, Instrs) :-
<br>Index: compiler/middle_rec.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/middle_rec.m,v
<br>retrieving revision 1.139
<br>diff -u -p -b -r1.139 middle_rec.m
<br>--- compiler/middle_rec.m 21 Oct 2009 06:36:20 -0000 1.139
<br>+++ compiler/middle_rec.m 22 Nov 2009 00:33:02 -0000
<br>@@ -529,6 +529,7 @@ find_used_registers_instr(Uinstr, !Used)
<br> ; Uinstr = incr_sp(_, _, _)
<br> ; Uinstr = decr_sp(_)
<br> ; Uinstr = decr_sp_and_return(_)
<br>+ ; Uinstr = join_and_continue(_)
<br> )
<br> ;
<br> Uinstr = livevals(LvalSet),
<br>@@ -595,7 +596,6 @@ find_used_registers_instr(Uinstr, !Used)
<br> ; Uinstr = mark_ticket_stack(Lval)
<br> ; Uinstr = init_sync_term(Lval, _)
<br> ; Uinstr = fork_new_child(Lval, _)
<br>- ; Uinstr = join_and_continue(Lval, _)
<br> ),
<br> find_used_registers_lval(Lval, !Used)
<br> ).
<br>@@ -676,6 +676,8 @@ find_used_registers_rval(Rval, !Used) :-
<br>
<br> find_used_registers_mem_ref(stackvar_ref(Rval), !Used) :-
<br> find_used_registers_rval(Rval, !Used).
<br>+find_used_registers_mem_ref(parent_stackvar_ref(Rval), !Used) :-
<br>+ find_used_registers_rval(Rval, !Used).
<br> find_used_registers_mem_ref(framevar_ref(Rval), !Used) :-
<br> find_used_registers_rval(Rval, !Used).
<br> find_used_registers_mem_ref(heap_ref(Rval1, _, Rval2), !Used) :-
<br>Index: compiler/opt_debug.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/opt_debug.m,v
<br>retrieving revision 1.214
<br>diff -u -p -b -r1.214 opt_debug.m
<br>--- compiler/opt_debug.m 4 Nov 2009 03:44:49 -0000 1.214
<br>+++ compiler/opt_debug.m 22 Nov 2009 00:24:23 -0000
<br>@@ -354,6 +354,8 @@ dump_rvals(MaybeProcLabel, [Rval | Rvals
<br>
<br> dump_mem_ref(MaybeProcLabel, stackvar_ref(N)) =
<br> "stackvar_ref(" ++ dump_rval(MaybeProcLabel, N) ++ ")".
<br>+dump_mem_ref(MaybeProcLabel, parent_stackvar_ref(N)) =
<br>+ "parent_stackvar_ref(" ++ dump_rval(MaybeProcLabel, N) ++ ")".
<br> dump_mem_ref(MaybeProcLabel, framevar_ref(N)) =
<br> "framevar_ref(" ++ dump_rval(MaybeProcLabel, N) ++ ")".
<br> dump_mem_ref(MaybeProcLabel, heap_ref(R, T, N)) =
<br>@@ -1027,9 +1029,8 @@ dump_instr(MaybeProcLabel, AutoComments,
<br> Str = "fork_new_child(" ++ dump_lval(MaybeProcLabel, Lval)
<br> ++ dump_label(MaybeProcLabel, Child) ++ ", " ++ ")"
<br> ;
<br>- Instr = join_and_continue(Lval, Label),
<br>- Str = "join_and_continue(" ++ dump_lval(MaybeProcLabel, Lval) ++ ", "
<br>- ++ dump_label(MaybeProcLabel, Label) ++ ")"
<br>+ Instr = join_and_continue(Label),
<br>+ Str = "join_and_continue(" ++ dump_label(MaybeProcLabel, Label) ++ ")"
<br> ;
<br> Instr = foreign_proc_code(Decls, Comps, MCM, MFNL, MFL, MFOL, MNF, MDL,
<br> SSR, MD),
<br>Index: compiler/opt_util.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/opt_util.m,v
<br>retrieving revision 1.171
<br>diff -u -p -b -r1.171 opt_util.m
<br>--- compiler/opt_util.m 21 Oct 2009 06:36:21 -0000 1.171
<br>+++ compiler/opt_util.m 22 Nov 2009 10:35:36 -0000
<br>@@ -736,6 +736,7 @@ lval_refers_stackvars(global_var_ref(_))
<br> :- func mem_ref_refers_stackvars(mem_ref) = bool.
<br>
<br> mem_ref_refers_stackvars(stackvar_ref(_)) = yes.
<br>+mem_ref_refers_stackvars(parent_stackvar_ref(_)) = yes.
<br> mem_ref_refers_stackvars(framevar_ref(_)) = yes.
<br> mem_ref_refers_stackvars(heap_ref(Rval1, _, Rval2)) =
<br> bool.or(rval_refers_stackvars(Rval1), rval_refers_stackvars(Rval2)).
<br>@@ -887,7 +888,7 @@ instr_refers_to_stack(llds_instr(Uinstr,
<br> ; Uinstr = decr_sp_and_return(_)
<br> ; Uinstr = init_sync_term(_, _)
<br> ; Uinstr = fork_new_child(_, _)
<br>- ; Uinstr = join_and_continue(_, _)
<br>+ ; Uinstr = join_and_continue(_)
<br> ),
<br> Refers = yes
<br> ;
<br>@@ -1111,7 +1112,7 @@ can_instr_branch_away(decr_sp(_)) = no.
<br> can_instr_branch_away(decr_sp_and_return(_)) = yes.
<br> can_instr_branch_away(init_sync_term(_, _)) = no.
<br> can_instr_branch_away(fork_new_child(_, _)) = no.
<br>-can_instr_branch_away(join_and_continue(_, _)) = yes.
<br>+can_instr_branch_away(join_and_continue(_)) = yes.
<br> can_instr_branch_away(foreign_proc_code(_, Comps, _, _, _, _, _, _, _, _)) =
<br> can_components_branch_away(Comps).
<br>
<br>@@ -1190,7 +1191,7 @@ can_instr_fall_through(decr_sp(_)) = yes
<br> can_instr_fall_through(decr_sp_and_return(_)) = no.
<br> can_instr_fall_through(init_sync_term(_, _)) = yes.
<br> can_instr_fall_through(fork_new_child(_, _)) = yes.
<br>-can_instr_fall_through(join_and_continue(_, _)) = no.
<br>+can_instr_fall_through(join_and_continue(_)) = no.
<br> can_instr_fall_through(foreign_proc_code(_, _, _, _, _, _, _, _, _, _)) = yes.
<br>
<br> % Check whether an instruction sequence can possibly fall through
<br>@@ -1241,7 +1242,9 @@ can_use_livevals(decr_sp(_), no).
<br> can_use_livevals(decr_sp_and_return(_), yes).
<br> can_use_livevals(init_sync_term(_, _), no).
<br> can_use_livevals(fork_new_child(_, _), no).
<br>-can_use_livevals(join_and_continue(_, _), no).
<br>+% XXX: Is the synchronization term (now in R1) a liveval?, I don't want the
<br>+% move to be optimized away. -pbone
<br>+can_use_livevals(join_and_continue(_), no).
<br> can_use_livevals(foreign_proc_code(_, _, _, _, _, _, _, _, _, _), no).
<br>
<br> instr_labels(Instr, Labels, CodeAddrs) :-
<br>@@ -1314,7 +1317,7 @@ instr_labels_2(Uinstr, Labels, CodeAddrs
<br> Labels = [Child],
<br> CodeAddrs = []
<br> ;
<br>- Uinstr = join_and_continue(_, Label),
<br>+ Uinstr = join_and_continue(Label),
<br> Labels = [Label],
<br> CodeAddrs = []
<br> ;
<br>@@ -1404,7 +1407,7 @@ possible_targets(Uinstr, Labels, CodeAdd
<br> % XXX see the comment in instr_labels_2.
<br> unexpected(this_file, "possible_targets: decr_sp_and_return")
<br> ;
<br>- Uinstr = join_and_continue(_, Label),
<br>+ Uinstr = join_and_continue(Label),
<br> Labels = [Label],
<br> CodeAddrs = []
<br> ;
<br>@@ -1544,7 +1547,7 @@ instr_rvals_and_lvals(decr_sp(_), [], []
<br> instr_rvals_and_lvals(decr_sp_and_return(_), [], []).
<br> instr_rvals_and_lvals(init_sync_term(Lval, _), [], [Lval]).
<br> instr_rvals_and_lvals(fork_new_child(Lval, _), [], [Lval]).
<br>-instr_rvals_and_lvals(join_and_continue(Lval, _), [], [Lval]).
<br>+instr_rvals_and_lvals(join_and_continue(_), [], []).
<br> instr_rvals_and_lvals(foreign_proc_code(_, Cs, _, _, _, _, _, _, _, _),
<br> Rvals, Lvals) :-
<br> foreign_proc_components_get_rvals_and_lvals(Cs, Rvals, Lvals).
<br>@@ -1724,8 +1727,7 @@ count_temps_instr(init_sync_term(Lval, _
<br> count_temps_lval(Lval, !R, !F).
<br> count_temps_instr(fork_new_child(Lval, _), !R, !F) :-
<br> count_temps_lval(Lval, !R, !F).
<br>-count_temps_instr(join_and_continue(Lval, _), !R, !F) :-
<br>- count_temps_lval(Lval, !R, !F).
<br>+count_temps_instr(join_and_continue(_), !R, !F).
<br> count_temps_instr(foreign_proc_code(_, Comps, _, _, _, _, _, _, _, _),
<br> !R, !F) :-
<br> count_temps_components(Comps, !R, !F).
<br>@@ -1855,6 +1857,7 @@ count_temps_rval(Rval, !R, !F) :-
<br> count_temps_mem_ref(MemRef, !R, !F) :-
<br> (
<br> ( MemRef = stackvar_ref(Rval)
<br>+ ; MemRef = parent_stackvar_ref(Rval)
<br> ; MemRef = framevar_ref(Rval)
<br> ),
<br> count_temps_rval(Rval, !R, !F)
<br>@@ -1933,7 +1936,7 @@ touches_nondet_ctrl_instr(Uinstr) = Touc
<br> ; Uinstr = restore_maxfr(_)
<br> ; Uinstr = init_sync_term(_, _) % This is a safe approximation.
<br> ; Uinstr = fork_new_child(_, _) % This is a safe approximation.
<br>- ; Uinstr = join_and_continue(_, _) % This is a safe approximation.
<br>+ ; Uinstr = join_and_continue(_) % This is a safe approximation.
<br> ),
<br> Touch = yes
<br> ;
<br>@@ -2064,6 +2067,7 @@ touches_nondet_ctrl_rval(mem_addr(MemRef
<br> :- func touches_nondet_ctrl_mem_ref(mem_ref) = bool.
<br>
<br> touches_nondet_ctrl_mem_ref(stackvar_ref(_)) = no.
<br>+touches_nondet_ctrl_mem_ref(parent_stackvar_ref(_)) = no.
<br> touches_nondet_ctrl_mem_ref(framevar_ref(_)) = no.
<br> touches_nondet_ctrl_mem_ref(heap_ref(Rval, _, _)) =
<br> touches_nondet_ctrl_rval(Rval).
<br>@@ -2497,10 +2501,9 @@ replace_labels_instr(Uinstr0, Uinstr, Re
<br> replace_labels_label(Child0, Child, ReplMap),
<br> Uinstr = fork_new_child(Lval, Child)
<br> ;
<br>- Uinstr0 = join_and_continue(Lval0, Label0),
<br>+ Uinstr0 = join_and_continue(Label0),
<br> replace_labels_label(Label0, Label, ReplMap),
<br>- replace_labels_lval(Lval0, Lval, ReplMap),
<br>- Uinstr = join_and_continue(Lval, Label)
<br>+ Uinstr = join_and_continue(Label)
<br> ;
<br> Uinstr0 = foreign_proc_code(Decls, Comps0, MayCallMercury,
<br> MaybeFix, MaybeLayout, MaybeOnlyLayout, MaybeSub0, MaybeDef,
<br>@@ -2693,6 +2696,7 @@ replace_labels_rval(Rval0, Rval, ReplMap
<br> replace_labels_mem_ref(MemRef0, MemRef, ReplMap) :-
<br> (
<br> ( MemRef0 = stackvar_ref(_)
<br>+ ; MemRef0 = parent_stackvar_ref(_)
<br> ; MemRef0 = framevar_ref(_)
<br> ),
<br> MemRef = MemRef0
<br>Index: compiler/par_conj_gen.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/par_conj_gen.m,v
<br>retrieving revision 1.40
<br>diff -u -p -b -r1.40 par_conj_gen.m
<br>--- compiler/par_conj_gen.m 3 Sep 2009 23:07:28 -0000 1.40
<br>+++ compiler/par_conj_gen.m 23 Nov 2009 03:05:41 -0000
<br>@@ -186,11 +186,11 @@ generate_par_conj(Goals, GoalInfo, CodeM
<br> (
<br> % The highest numbered slot has the lowest address.
<br> list.last(SyncTermSlots, SyncTermBaseSlotPrime),
<br>- SyncTermBaseSlotPrime = stackvar(SlotNum),
<br>+ SyncTermBaseSlotPrime = stackvar(SlotNumPrime),
<br> StackId = det_stack
<br> ->
<br> SyncTermBaseSlot = SyncTermBaseSlotPrime,
<br>- ParentSyncTermBaseSlot = parent_stackvar(SlotNum)
<br>+ SlotNum = SlotNumPrime
<br> ;
<br> unexpected(this_file, "generate_par_conj")
<br> ),
<br>@@ -204,8 +204,8 @@ generate_par_conj(Goals, GoalInfo, CodeM
<br> set_par_conj_depth(Depth+1, !CI),
<br> get_next_label(EndLabel, !CI),
<br> clear_all_registers(no, !CI),
<br>- generate_det_par_conj_2(Goals, ParentSyncTermBaseSlot, EndLabel, Initial,
<br>- no, GoalCode, !CI),
<br>+ generate_det_par_conj_2(Goals, SlotNum, EndLabel, Initial, no, GoalCode,
<br>+ !CI),
<br> set_par_conj_depth(Depth, !CI),
<br>
<br> EndLabelCode = singleton(
<br>@@ -252,12 +252,12 @@ generate_par_conj(Goals, GoalInfo, CodeM
<br> place_all_outputs(Outputs, !CI).
<br>
<br> :- pred generate_det_par_conj_2(list(hlds_goal)::in,
<br>- lval::in, label::in, instmap::in, branch_end::in, llds_code::out,
<br>+ int::in, label::in, instmap::in, branch_end::in, llds_code::out,
<br> code_info::in, code_info::out) is det.
<br>
<br>-generate_det_par_conj_2([], _ParentSyncTermBaseSlot, _EndLabel,
<br>+generate_det_par_conj_2([], _ParentSyncTermBaseSlotNum, _EndLabel,
<br> _Initial, _, empty, !CI).
<br>-generate_det_par_conj_2([Goal | Goals], ParentSyncTermBaseSlot, EndLabel,
<br>+generate_det_par_conj_2([Goal | Goals], ParentSyncTermBaseSlotNum, EndLabel,
<br> Initial, MaybeEnd0, Code, !CI) :-
<br> remember_position(!.CI, StartPos),
<br> code_gen.generate_goal(model_det, Goal, ThisGoalCode0, !CI),
<br>@@ -271,6 +271,18 @@ generate_det_par_conj_2([Goal | Goals],
<br> generate_branch_end(StoreMap, MaybeEnd0, MaybeEnd, SaveCode0, !CI),
<br> replace_stack_vars_by_parent_sv(SaveCode0, SaveCode),
<br>
<br>+ ParentSyncTermBaseSlot = parent_stackvar(ParentSyncTermBaseSlotNum),
<br>+ SyncTermPointer = mem_addr(parent_stackvar_ref(
<br>+ const(llconst_int(ParentSyncTermBaseSlotNum)))),
<br>+ % The move instruction clobbers MR_r1,
<br>+ % The join_and_continue instruction clobbers MR_succip.
<br>+ % XXX: How do I tell the low-level backend that I want to use these
<br>+ % registers and arrange for anything important to be saved? -pbone
<br>+ JoinInstructions = [
<br>+ llds_instr(assign(reg(reg_r, 1), SyncTermPointer),
<br>+ "Put the address of the sync term in r1"),
<br>+ llds_instr(join_and_continue(EndLabel),
<br>+ "Join after parallel execution")],
<br> (
<br> Goals = [_ | _],
<br> get_next_label(NextConjunct, !CI),
<br>@@ -279,22 +291,17 @@ generate_det_par_conj_2([Goal | Goals],
<br> llds_instr(fork_new_child(ParentSyncTermBaseSlot, NextConjunct),
<br> "fork off a child")
<br> ),
<br>- JoinCode = from_list([
<br>- llds_instr(join_and_continue(ParentSyncTermBaseSlot, EndLabel),
<br>- "finish"),
<br>- llds_instr(label(NextConjunct),
<br>- "start of the next conjunct")
<br>- ])
<br>+ JoinCode = from_list( JoinInstructions ++
<br>+ [llds_instr(label(NextConjunct),
<br>+ "start of the next conjunct")]
<br>+ )
<br> ;
<br> Goals = [],
<br> ForkCode = empty,
<br>- JoinCode = singleton(
<br>- llds_instr(join_and_continue(ParentSyncTermBaseSlot, EndLabel),
<br>- "finish")
<br>- )
<br>+ JoinCode = from_list(JoinInstructions)
<br> ),
<br> ThisCode = ForkCode ++ ThisGoalCode ++ SaveCode ++ JoinCode,
<br>- generate_det_par_conj_2(Goals, ParentSyncTermBaseSlot, EndLabel, Initial,
<br>+ generate_det_par_conj_2(Goals, ParentSyncTermBaseSlotNum, EndLabel, Initial,
<br> MaybeEnd, RestCode, !CI),
<br> Code = ThisCode ++ RestCode.
<br>
<br>Index: compiler/reassign.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/reassign.m,v
<br>retrieving revision 1.30
<br>diff -u -p -b -r1.30 reassign.m
<br>--- compiler/reassign.m 21 Oct 2009 06:36:21 -0000 1.30
<br>+++ compiler/reassign.m 22 Nov 2009 00:24:53 -0000
<br>@@ -320,7 +320,7 @@ remove_reassign_loop([Instr0 | Instrs0],
<br> !:KnownContentsMap = map.init,
<br> !:DepLvalMap = map.init
<br> ;
<br>- Uinstr0 = join_and_continue(_, _),
<br>+ Uinstr0 = join_and_continue(_),
<br> !:RevInstrs = [Instr0 | !.RevInstrs],
<br> % Other threads may modify any lval.
<br> !:KnownContentsMap = map.init,
<br>Index: compiler/use_local_vars.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/use_local_vars.m,v
<br>retrieving revision 1.40
<br>diff -u -p -b -r1.40 use_local_vars.m
<br>--- compiler/use_local_vars.m 21 Oct 2009 06:36:22 -0000 1.40
<br>+++ compiler/use_local_vars.m 22 Nov 2009 00:25:11 -0000
<br>@@ -690,7 +690,7 @@ substitute_lval_in_instr_until_defn_2(Ol
<br> ; Uinstr0 = decr_sp_and_return(_)
<br> ; Uinstr0 = init_sync_term(_, _)
<br> ; Uinstr0 = fork_new_child(_, _)
<br>- ; Uinstr0 = join_and_continue(_, _)
<br>+ ; Uinstr0 = join_and_continue(_)
<br> ; Uinstr0 = arbitrary_c_code(_, _, _)
<br> )
<br> ).
<br>Index: compiler/var_locn.m
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/compiler/var_locn.m,v
<br>retrieving revision 1.68
<br>diff -u -p -b -r1.68 var_locn.m
<br>--- compiler/var_locn.m 2 Sep 2009 00:30:24 -0000 1.68
<br>+++ compiler/var_locn.m 20 Nov 2009 21:52:41 -0000
<br>@@ -2270,11 +2270,9 @@ var_locn_materialize_vars_in_rval_avoid(
<br> var_locn_materialize_vars_in_mem_ref_avoid(ModuleInfo, MemRef0, MemRef, Avoid,
<br> Code, !VLI) :-
<br> (
<br>- MemRef0 = stackvar_ref(_),
<br>- MemRef = MemRef0,
<br>- Code = empty
<br>- ;
<br>- MemRef0 = framevar_ref(_),
<br>+ ( MemRef0 = stackvar_ref(_)
<br>+ ; MemRef0 = parent_stackvar_ref(_)
<br>+ ; MemRef0 = framevar_ref(_) ),
<br> MemRef = MemRef0,
<br> Code = empty
<br> ;
<br>Index: runtime/mercury_context.c
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/runtime/mercury_context.c,v
<br>retrieving revision 1.70
<br>diff -u -p -b -r1.70 mercury_context.c
<br>--- runtime/mercury_context.c 6 Nov 2009 05:40:24 -0000 1.70
<br>+++ runtime/mercury_context.c 23 Nov 2009 02:56:02 -0000
<br>@@ -811,9 +811,10 @@ MR_schedule_spark_globally(const MR_Spar
<br>
<br> #ifndef MR_HIGHLEVEL_CODE
<br>
<br>+
<br> MR_define_extern_entry(MR_do_runnext);
<br>
<br>-MR_BEGIN_MODULE(scheduler_module)
<br>+MR_BEGIN_MODULE(scheduler_module_do_runnext)
<br> MR_init_entry_an(MR_do_runnext);
<br> MR_BEGIN_CODE
<br>
<br>@@ -983,6 +984,133 @@ MR_define_entry(MR_do_runnext);
<br>
<br> MR_END_MODULE
<br>
<br>+#if defined(MR_THREAD_SAFE) && defined(MR_LL_PARALLEL_CONJ)
<br>+MR_define_extern_entry(MR_do_join_and_continue);
<br>+
<br>+MR_BEGIN_MODULE(scheduler_module_do_join_and_continue)
<br>+ MR_init_entry_an(MR_do_join_and_continue);
<br>+MR_BEGIN_CODE
<br>+
<br>+MR_define_entry(MR_do_join_and_continue);
<br>+{
<br>+ MR_SyncTerm *jnc_st = (MR_SyncTerm *) MR_r1;
<br>+
<br>+ if (!jnc_st->MR_st_is_shared) {
<br>+ /* This parallel conjunction has only executed sequentially. */
<br>+ if (--jnc_st->MR_st_count == 0) {
<br>+ /*
<br>+ ** It has finished executing, continue execution from the join
<br>+ ** label.
<br>+ */
<br>+ MR_proceed();
<br>+ } else {
<br>+ /*
<br>+ ** It has not finished executing. Try to finish it by executing
<br>+ ** our sparks.
<br>+ ** This code was formerly MR_join_and_continue_1()
<br>+ */
<br>+ MR_Context *jnc_ctxt;
<br>+ MR_bool jnc_popped;
<br>+ MR_Spark jnc_spark;
<br>+
<br>+ jnc_ctxt = MR_ENGINE(MR_eng_this_context);
<br>+ jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque,
<br>+ &jnc_spark);
<br>+ if (jnc_popped) {
<br>+ MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks);
<br>+ MR_GOTO(jnc_spark.MR_spark_resume);
<br>+ } else {
<br>+ /*
<br>+ ** Someone's stolen our sparks, we should try to execute
<br>+ ** something that's been scheduled globally.
<br>+ */
<br>+ MR_runnext();
<br>+ }
<br>+ }
<br>+ } else {
<br>+ /* This parallel conjunction may be executing in parallel. */
<br>+ MR_LOCK(&MR_sync_term_lock, "continue");
<br>+ if (--jnc_st->MR_st_count == 0) {
<br>+ /* This parallel conjunction has finished. */
<br>+ if (MR_ENGINE(MR_eng_this_context) == jnc_st->MR_st_orig_context) {
<br>+ /*
<br>+ ** This context originated this parallel conjunction and all
<br>+ ** the branches have finished so jump to the join label.
<br>+ */
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue i");
<br>+ MR_proceed();
<br>+ } else {
<br>+ /*
<br>+ ** This context didn't originate this parallel conjunction and
<br>+ ** we're the last branch to finish. The originating context
<br>+ ** should be suspended waiting for us to finish, so wake it up.
<br>+ */
<br>+ jnc_st->MR_st_orig_context->MR_ctxt_resume = (MR_Code*)MR_succip;
<br>+ MR_schedule_context(jnc_st->MR_st_orig_context);
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue ii");
<br>+ MR_runnext();
<br>+ }
<br>+ } else {
<br>+ /*
<br>+ ** The parallel conjunction is being executed in parallel but it is
<br>+ ** not yet finished. This code was Formerly
<br>+ ** MR_join_and_continue_2()
<br>+ */
<br>+ MR_Context *jnc_ctxt;
<br>+ MR_bool jnc_popped;
<br>+ MR_Spark jnc_spark;
<br>+
<br>+ jnc_ctxt = MR_ENGINE(MR_eng_this_context);
<br>+ jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque,
<br>+ &jnc_spark);
<br>+ if (jnc_popped && (jnc_spark.MR_spark_parent_sp == MR_parent_sp)) {
<br>+ /*
<br>+ ** The spark at the top of the stack is from to the same parallel
<br>+ ** conjunction that we've just been executing. We can immediately
<br>+ ** execute the next branch of the same parallel conjunction in
<br>+ ** the current context.
<br>+ */
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue_2 i");
<br>+ MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks);
<br>+ MR_GOTO(jnc_spark.MR_spark_resume);
<br>+ } else {
<br>+ /*
<br>+ ** The spark stack is empty or the next spark is from a different
<br>+ ** parallel conjunction to the one we've been executing. Either
<br>+ ** way, there's nothing more we can do with this context right
<br>+ ** now. Put back the spark we won't be using.
<br>+ */
<br>+ if (jnc_popped) {
<br>+ MR_wsdeque_putback_bottom(&jnc_ctxt->MR_ctxt_spark_deque,
<br>+ &jnc_spark);
<br>+ }
<br>+ /*
<br>+ ** If this context originated the parallel conjunction we've been
<br>+ ** executing, the rest of the parallel conjunction must have been
<br>+ ** put on the global spark queue to be executed in other
<br>+ ** contexts. This context will need to be resumed once the
<br>+ ** parallel conjunction is completed, so suspend the context.
<br>+ **
<br>+ ** What if the other conjuncts where put on the global queue
<br>+ ** but haven't yet been taken by other threads? Then this step
<br>+ ** is redundant. It's not worth fixing, this problem will go
<br>+ ** away once we enable work-stealing. - pbone.
<br>+ */
<br>+ if (jnc_ctxt == jnc_st->MR_st_orig_context) {
<br>+ MR_save_context(jnc_ctxt);
<br>+ MR_ENGINE(MR_eng_this_context) = NULL;
<br>+ }
<br>+ /* Finally look for other work. */
<br>+ MR_UNLOCK(&MR_sync_term_lock, "continue_2 ii");
<br>+ MR_runnext();
<br>+ }
<br>+ }
<br>+ }
<br>+}
<br>+MR_END_MODULE
<br>+
<br>+#endif /* defined(MR_THREAD_SAFE) && defined(MR_LL_PARALLEL_CONJ) */
<br>+
<br> #endif /* !MR_HIGHLEVEL_CODE */
<br>
<br> #ifdef MR_LL_PARALLEL_CONJ
<br>@@ -1051,7 +1179,10 @@ void mercury_sys_init_scheduler_wrapper_
<br> void mercury_sys_init_scheduler_wrapper_init(void)
<br> {
<br> #ifndef MR_HIGHLEVEL_CODE
<br>- scheduler_module();
<br>+ scheduler_module_do_runnext();
<br>+#if defined(MR_THREAD_SAFE) && defined(MR_LL_PARALLEL_CONJ)
<br>+ scheduler_module_do_join_and_continue();
<br>+#endif
<br> #endif
<br> }
<br>
<br>Index: runtime/mercury_context.h
<br>===================================================================
<br>RCS file: /home/mercury1/repository/mercury/runtime/mercury_context.h,v
<br>retrieving revision 1.55
<br>diff -u -p -b -r1.55 mercury_context.h
<br>--- runtime/mercury_context.h 17 Nov 2009 06:30:26 -0000 1.55
<br>+++ runtime/mercury_context.h 22 Nov 2009 06:33:40 -0000
<br>@@ -811,111 +811,19 @@ extern void MR_schedule_context(
<br> MR_atomic_inc_int(&MR_num_outstanding_contexts_and_all_sparks); \
<br> } while (0)
<br>
<br>- #define MR_join_and_continue(sync_term, join_label) \
<br>- do { \
<br>- MR_SyncTerm *jnc_st = (MR_SyncTerm *) &sync_term; \
<br>- \
<br>- if (!jnc_st->MR_st_is_shared) { \
<br>- /* This parallel conjunction has only executed sequentially. */ \
<br>- if (--jnc_st->MR_st_count == 0) { \
<br>- MR_GOTO(join_label); \
<br>- } else { \
<br>- MR_join_and_continue_1(); \
<br>- } \
<br>- } else { \
<br>- /* This parallel conjunction may be executing in parallel. */ \
<br>- MR_LOCK(&MR_sync_term_lock, "continue"); \
<br>- if (--jnc_st->MR_st_count == 0) { \
<br>- if (MR_ENGINE(MR_eng_this_context) \
<br>- == jnc_st->MR_st_orig_context) \
<br>- { \
<br>- /* \
<br>- ** This context originated this parallel conjunction and \
<br>- ** all the branches have finished so jump to the join \
<br>- ** label. \
<br>- */ \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue i"); \
<br>- MR_GOTO(join_label); \
<br>- } else { \
<br>- /* \
<br>- ** This context didn't originate this parallel \
<br>- ** conjunction and we're the last branch to finish. The \
<br>- ** originating context should be suspended waiting for us \
<br>- ** to finish, so wake it up. \
<br>- */ \
<br>- jnc_st->MR_st_orig_context->MR_ctxt_resume = join_label; \
<br>- MR_schedule_context(jnc_st->MR_st_orig_context); \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue ii"); \
<br>- MR_runnext(); \
<br>- } \
<br>- } else { \
<br>- MR_join_and_continue_2(); \
<br>- } \
<br>- } \
<br>- } while (0)
<br>-
<br>- #define MR_join_and_continue_1() \
<br>- do { \
<br>- MR_Context *jnc_ctxt; \
<br>- MR_bool jnc_popped; \
<br>- MR_Spark jnc_spark; \
<br>- \
<br>- jnc_ctxt = MR_ENGINE(MR_eng_this_context); \
<br>- jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque, \
<br>- &jnc_spark); \
<br>- if (jnc_popped) { \
<br>- MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks); \
<br>- MR_GOTO(jnc_spark.MR_spark_resume); \
<br>- } else { \
<br>- MR_runnext(); \
<br>- } \
<br>- } while (0)
<br>-
<br>- #define MR_join_and_continue_2() \
<br>+ /*
<br>+ ** At the end of a parallel conjunct this is called, depending on which
<br>+ ** context calls this the context may block, jump to the join label or look
<br>+ ** for other parallel work.
<br>+ ** The arguments are:
<br>+ ** MR_r1 - sync term pointer.
<br>+ ** MR_succip - join label.
<br>+ */
<br>+ MR_declare_entry(MR_do_join_and_continue);
<br>+ #define MR_join_and_continue(label) \
<br> do { \
<br>- MR_Context *jnc_ctxt; \
<br>- MR_bool jnc_popped; \
<br>- MR_Spark jnc_spark; \
<br>- \
<br>- jnc_ctxt = MR_ENGINE(MR_eng_this_context); \
<br>- jnc_popped = MR_wsdeque_pop_bottom(&jnc_ctxt->MR_ctxt_spark_deque, \
<br>- &jnc_spark); \
<br>- if (jnc_popped && (jnc_spark.MR_spark_parent_sp == MR_parent_sp)) { \
<br>- /* \
<br>- ** The spark at the top of the stack is due to the same parallel \
<br>- ** conjunction that we've just been executing. We can immediately \
<br>- ** execute the next branch of the same parallel conjunction in \
<br>- ** the current context. \
<br>- */ \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue_2 i"); \
<br>- MR_atomic_dec_int(&MR_num_outstanding_contexts_and_all_sparks); \
<br>- MR_GOTO(jnc_spark.MR_spark_resume); \
<br>- } else { \
<br>- /* \
<br>- ** The spark stack is empty or the next spark is from a different \
<br>- ** parallel conjunction to the one we've been executing. Either \
<br>- ** way, there's nothing more we can do with this context right \
<br>- ** now. Put back the spark we won't be using. \
<br>- */ \
<br>- if (jnc_popped) { \
<br>- MR_wsdeque_putback_bottom(&jnc_ctxt->MR_ctxt_spark_deque, \
<br>- &jnc_spark); \
<br>- } \
<br>- /* \
<br>- ** If this context originated the parallel conjunction we've been \
<br>- ** executing, the rest of the parallel conjunction must have been \
<br>- ** put on the global spark queue to be executed in other \
<br>- ** contexts. This context will need to be resumed once the \
<br>- ** parallel conjunction is completed, so suspend the context. \
<br>- */ \
<br>- if (jnc_ctxt == jnc_st->MR_st_orig_context) { \
<br>- MR_save_context(jnc_ctxt); \
<br>- MR_ENGINE(MR_eng_this_context) = NULL; \
<br>- } \
<br>- /* Finally look for other work. */ \
<br>- MR_UNLOCK(&MR_sync_term_lock, "continue_2 ii"); \
<br>- MR_runnext(); \
<br>- } \
<br>+ MR_succip_word = label; \
<br>+ MR_GOTO(MR_ENTRY(MR_do_join_and_continue)); \
<br> } while (0)
<br>
<br> /* This needs to come after the definition of MR_SparkDeque_Struct. */
<br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26472184/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Reviews-f14121.html" embed="fixTarget[14121]" target="_top" >Mercury - Reviews</a></p>
tag:old.nabble.com,2006:post-26472121
Re: Large MR_join_and_continue() macros in runtime.
2009-11-22T18:59:25Z
2009-11-22T18:59:25Z
Paul Bone
On Sat, Nov 21, 2009 at 07:49:10AM +1100, Zoltan Somogyi wrote:
<div class='shrinkable-quote'><div class='shrinkable-quote'><br>> On 18-Nov-2009, Paul Bone <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26472121&i=0" target="_top" rel="nofollow">pbone@...</a>> wrote:
<br>> > I've found myself modifying and maintaining the large MR_join_and_continue()
<br>> > macros in the runtime. The C preprocessor language is very clumsy, and I'd
<br>> > rather write these as native C procedures.
<br>>
<br>> As you and Peter both said, C procedures won't work, since they will lead to
<br>> stack leaks.
<br>>
<br>> Feel free to try to make the code a Mercury procedure hand-written in C,
<br>> but that has its own problems, since you need to arrange parameter passing
<br>> without clobbering the values of any abstract machine registers you need.
<br>> However, if I were you, I would keep it a macro, but give it a major cleanup,
<br>> e.g. fix indentation, get rid of "== MR_TRUE", and use submacros defined with
<br>> "#if ... #else ... #endif" to avoid using macros with code arguments like
<br>> MR_IF_PROFILE_PARALLEL_EXECUTION_SUPPORT.
</div></div>I don't see a case of "== MR_TRUE" in MR_join_and_continue.
<br><br><br /> <div class="small"><br/><img src="http://old.nabble.com/images/icon_attachment.gif" > <strong>signature.asc</strong> (500 bytes) <a href="http://old.nabble.com/attachment/26472121/0/signature.asc" target="_top">Download Attachment</a></div><p>From forum: <a href="http://old.nabble.com/Mercury---Dev-f14120.html" embed="fixTarget[14120]" target="_top" >Mercury - Dev</a></p>