Ignore:
Timestamp:
Sep 2, 2021, 2:04:56 PM (4 years ago)
Author:
Jacob Prud'homme <jafprudhomme@…>
Branches:
ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum
Children:
81e0c61
Parents:
24ebddac (diff), b183717 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into jacob/cs343-translation

Location:
doc/theses/andrew_beach_MMath/code
Files:
9 edited
10 moved

Legend:

Unmodified
Added
Removed

  • doc/theses/andrew_beach_MMath/code/FixupEmpty.java

    r24ebddac r761e146  
    1 public class ResumeFixupEmpty {
     1public class FixupEmpty {
    22        public interface Fixup {
    33                public int op(int fixup);

  • doc/theses/andrew_beach_MMath/code/FixupOther.java

    r24ebddac r761e146  
    1 public class ResumeFixupOther {
     1public class FixupOther {
    22        public interface Fixup {
    33                public int op(int fixup);

  • doc/theses/andrew_beach_MMath/code/cond-catch.py

    r24ebddac r761e146  
    3232
    3333    end_time = thread_time_ns()
    34     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     34    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    3535
    3636

  • doc/theses/andrew_beach_MMath/code/fixup-empty.py

    r24ebddac r761e146  
    2525
    2626    end_time = thread_time_ns()
    27     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     27    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    2828
    2929

  • doc/theses/andrew_beach_MMath/code/fixup-other.py

    r24ebddac r761e146  
    2727
    2828    end_time = thread_time_ns()
    29     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     29    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    3030
    3131

  • doc/theses/andrew_beach_MMath/code/run.sh

    r24ebddac r761e146  
    11#!/usr/bin/env bash
    22
    3 readonly ALL_TESTS=(raise-{empty,detor,finally,other} try-{catch,finally} cond-match-{all,none} \
    4                     raise-{fixup-empty,fixup-other})
     3readonly ALL_TESTS=(raise-{empty,detor,finally,other} try-{catch,finally} \
     4                        cond-match-{all,none} fixup-{empty,other})
    55
    66gen-file-name() (
    … …  
    1818)
    1919
    20 #readonly N=${1:-5}
    2120readonly N=${1:-1}
    2221readonly OUT_FILE=$(gen-file-name ${2:-run-%-$N})

  • doc/theses/andrew_beach_MMath/code/test.sh

    r24ebddac r761e146  
    1313#   View the result from TEST in LANGUAGE stored in FILE.
    1414
    15 readonly ITERS_1M=1000000 # 1 000 000, one million
    16 readonly ITERS_10M=10000000 # 10 000 000, ten million
    17 readonly ITERS_100M=100000000 # 100 000 000, hundred million
    18 readonly ITERS_1000M=1000000000 # 1 000 000 000, billion
     15readonly MIL=000000
     16# Various preset values used as arguments.
     17readonly ITERS_1M=1$MIL
     18readonly ITERS_10M=10$MIL
     19readonly ITERS_100M=100$MIL
     20readonly ITERS_1000M=1000$MIL
    1921readonly STACK_HEIGHT=100
    2022
    … …  
    3032        case "$1" in
    3133        *.cfa)
    32                 # Requires a symbolic link.
    33                 mmake "${1%.cfa}" "$1" cfa -DNDEBUG -nodebug -O3 "$1" -o "${1%.cfa}"
     34                # A symbolic link/local copy can be used as an override.
     35                cmd=./cfa
     36                if [ ! -x $cmd ]; then
     37                        cmd=cfa
     38                fi
     39                mmake "${1%.cfa}" "$1" $cmd -DNDEBUG -nodebug -O3 "$1" -o "${1%.cfa}"
    3440                ;;
    3541        *.cpp)
    … …  
    8389raise-empty)
    8490        CFAT="./throw-empty $ITERS_1M $STACK_HEIGHT"
    85 # see resume-fixup-empty-r      CFAR="./resume-empty $ITERS_1M $STACK_HEIGHT"
     91        CFAR="./resume-empty $ITERS_1M $STACK_HEIGHT"
    8692        CPP="./throw-empty-cpp $ITERS_1M $STACK_HEIGHT"
    8793        JAVA="java ThrowEmpty $ITERS_1M $STACK_HEIGHT"
    … …  
    9096raise-detor)
    9197        CFAT="./throw-detor $ITERS_1M $STACK_HEIGHT"
    92 # N/A   CFAR="./resume-detor $ITERS_1M $STACK_HEIGHT"
     98        CFAR="./resume-detor $ITERS_1M $STACK_HEIGHT"
    9399        CPP="./throw-detor-cpp $ITERS_1M $STACK_HEIGHT"
    94100        JAVA=unsupported
    … …  
    97103raise-finally)
    98104        CFAT="./throw-finally $ITERS_1M $STACK_HEIGHT"
    99 # N/A   CFAR="./resume-finally $ITERS_1M $STACK_HEIGHT"
     105        CFAR="./resume-finally $ITERS_1M $STACK_HEIGHT"
    100106        CPP=unsupported
    101107        JAVA="java ThrowFinally $ITERS_1M $STACK_HEIGHT"
    … …  
    104110raise-other)
    105111        CFAT="./throw-other $ITERS_1M $STACK_HEIGHT"
    106 # N/A   CFAR="./resume-other $ITERS_1M $STACK_HEIGHT"
     112        CFAR="./resume-other $ITERS_1M $STACK_HEIGHT"
    107113        CPP="./throw-other-cpp $ITERS_1M $STACK_HEIGHT"
    108114        JAVA="java ThrowOther $ITERS_1M $STACK_HEIGHT"
    … …  
    137143        PYTHON="./cond-catch.py $ITERS_10M 0"
    138144        ;;
    139 raise-fixup-empty)
    140         CFAT="./resume-fixup-empty-f $ITERS_10M $STACK_HEIGHT"
    141         CFAR="./resume-fixup-empty-r $ITERS_10M $STACK_HEIGHT"
    142         CPP="./resume-fixup-empty-cpp $ITERS_10M $STACK_HEIGHT"
    143         JAVA="java ResumeFixupEmpty $ITERS_10M $STACK_HEIGHT"
    144         PYTHON="./resume-fixup-empty.py $ITERS_10M $STACK_HEIGHT"
     145fixup-empty)
     146        CFAT="./fixup-empty-f $ITERS_10M $STACK_HEIGHT"
     147        CFAR="./fixup-empty-r $ITERS_10M $STACK_HEIGHT"
     148        CPP="./fixup-empty-cpp $ITERS_10M $STACK_HEIGHT"
     149        JAVA="java FixupEmpty $ITERS_10M $STACK_HEIGHT"
     150        PYTHON="./fixup-empty.py $ITERS_10M $STACK_HEIGHT"
    145151        ;;
    146 raise-fixup-other)
    147         CFAT="./resume-fixup-other-f $ITERS_10M $STACK_HEIGHT"
    148         CFAR="./resume-fixup-other-r $ITERS_10M $STACK_HEIGHT"
    149         CPP="./resume-fixup-other-cpp $ITERS_10M $STACK_HEIGHT"
    150         JAVA="java ResumeFixupOther $ITERS_10M $STACK_HEIGHT"
    151         PYTHON="./resume-fixup-other.py $ITERS_10M $STACK_HEIGHT"
     152fixup-other)
     153        CFAT="./fixup-other-f $ITERS_10M $STACK_HEIGHT"
     154        CFAR="./fixup-other-r $ITERS_10M $STACK_HEIGHT"
     155        CPP="./fixup-other-cpp $ITERS_10M $STACK_HEIGHT"
     156        JAVA="java FixupOther $ITERS_10M $STACK_HEIGHT"
     157        PYTHON="./fixup-other.py $ITERS_10M $STACK_HEIGHT"
    152158        ;;
    153159*)

  • doc/theses/andrew_beach_MMath/code/throw-empty.py

    r24ebddac r761e146  
    3333
    3434    end_time = thread_time_ns()
    35     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     35    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    3636
    3737

  • doc/theses/andrew_beach_MMath/code/throw-finally.py

    r24ebddac r761e146  
    3636
    3737    end_time = thread_time_ns()
    38     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     38    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    3939
    4040

  • doc/theses/andrew_beach_MMath/code/throw-other.py

    r24ebddac r761e146  
    4040
    4141    end_time = thread_time_ns()
    42     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     42    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    4343
    4444

  • doc/theses/andrew_beach_MMath/code/throw-with.py

    r24ebddac r761e146  
    4343
    4444    end_time = thread_time_ns()
    45     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     45    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    4646
    4747

  • doc/theses/andrew_beach_MMath/code/try-catch.py

    r24ebddac r761e146  
    2323
    2424    end_time = thread_time_ns()
    25     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     25    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    2626
    2727

  • doc/theses/andrew_beach_MMath/code/try-finally.py

    r24ebddac r761e146  
    2222
    2323    end_time = thread_time_ns()
    24     print('Run-Time (s) {:.1f}:'.format((end_time - start_time) / 1_000_000_000.))
     24    print('Run-Time (s): {:.1f}'.format((end_time - start_time) / 1_000_000_000.))
    2525
    2626
Note: See TracChangeset for help on using the changeset viewer.