Changeset 3590 in CLRX
 Timestamp:
 Jan 7, 2018, 4:38:52 PM (3 years ago)
 Location:
 CLRadeonExtender/trunk
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

CLRadeonExtender/trunk/amdasm/AsmRegAlloc.cpp
r3589 r3590 764 764 { 765 765 // first read before write at all, need change totalcount, ssaId 766 entry.prevSSAIds.insert({ ssaEntry.first, ssaId }); 766 767 ssaId++; 767 768 totalSSACount++; 768 } 769 } 770 else if (ssaId == 0 && ssaEntry.second.readBeforeWrite) 771 { 772 entry.prevSSAIds.insert({ ssaEntry.first, ssaId }); 773 ssaId++; 774 } 775 769 776 if (ssaId != totalSSACount) // save old ssaId 770 777 entry.prevSSAIds.insert({ ssaEntry.first, ssaId }); 
CLRadeonExtender/trunk/tests/amdasm/AsmRegAlloc.cpp
r3589 r3590 826 826 { }, 827 827 true, "" 828 } 829 #if 0 830 , 828 }, 831 829 { /* 3  longer tree (more blocks) */ 832 830 R"ffDXD(.regvar sa:s:8, va:v:12, vb:v:10 … … 861 859 tx1: v_min_f32 vb[0], va[0], va[1] 862 860 v_madak_f32 vb[5], vb[0], va[1], 2.5 861 s_endpgm 863 862 ux1: v_nop 863 s_endpgm 864 864 vx1: v_add_f32 va[9], v11, vb[4] 865 s_endpgm 865 866 wx1: v_add_f32 va[10], v11, vb[4] 866 867 s_endpgm … … 868 869 tx2: v_max_f32 vb[1], va[0], va[1] 869 870 v_madak_f32 va[3], va[0], va[1], 2.5 871 s_endpgm 870 872 ux2: v_nop 871 873 s_nop 7 874 s_endpgm 872 875 vx2: v_nop 876 s_endpgm 873 877 wx2: v_add_f32 va[8], v19, vb[5] 874 878 s_endpgm … … 876 880 tx3: v_max_u32 vb[2], va[0], va[1] 877 881 v_madmk_f32 vb[3], va[0], 1.23, vb[1] 882 s_endpgm 878 883 ux3: v_add_f32 va[7], v11, vb[5] 884 s_endpgm 879 885 vx3: v_add_f32 va[6], v13, vb[5] 886 s_endpgm 880 887 wx3: v_nop 881 888 s_endpgm … … 885 892 { { 1, false }, { 4, false }, { 8, false }, { 12, false } }, 886 893 { 887 { { "", 0 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },888 { { "", 1 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },889 { { "", 256 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },890 { { "", 256+1 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },891 { { "", 256+2 }, SSAInfo( SIZE_MAX, 0, 0, SIZE_MAX, 0, false) },892 { { "", 256+3 }, SSAInfo( SIZE_MAX, 0, 0, SIZE_MAX, 0, false) },893 { { "", 256+4 }, SSAInfo( SIZE_MAX, 0, 0, SIZE_MAX, 0, false) },894 { { "", 256+5 }, SSAInfo( SIZE_MAX, 0, 0, SIZE_MAX, 0, false) },894 { { "", 0 }, SSAInfo(0, 0, 0, 0, 0, true) }, 895 { { "", 1 }, SSAInfo(0, 0, 0, 0, 0, true) }, 896 { { "", 256 }, SSAInfo(0, 0, 0, 0, 0, true) }, 897 { { "", 256+1 }, SSAInfo(0, 0, 0, 0, 0, true) }, 898 { { "", 256+2 }, SSAInfo(0, 0, 0, 0, 0, false) }, 899 { { "", 256+3 }, SSAInfo(0, 0, 0, 0, 0, false) }, 900 { { "", 256+4 }, SSAInfo(0, 0, 0, 0, 0, false) }, 901 { { "", 256+5 }, SSAInfo(0, 0, 0, 0, 0, false) }, 895 902 { { "va", 0 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) }, 896 { { "va", 1 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) } ,903 { { "va", 1 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) } 897 904 }, false, false, false }, 898 905 { 28, 52, 899 906 { { 2, false }, { 5, false }, { 9, false }, { 13, false } }, 900 907 { 901 { { "", 0 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },902 { { "", 1 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },903 { { "", 256+2 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },908 { { "", 0 }, SSAInfo(0, 0, 0, 0, 0, true) }, 909 { { "", 1 }, SSAInfo(0, 0, 0, 0, 0, true) }, 910 { { "", 256+2 }, SSAInfo(0, 0, 0, 0, 0, true) }, 904 911 { { "va", 0 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 905 912 { { "va", 1 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, … … 912 919 { { 3, false }, { 6, false }, { 10, false }, { 14, false } }, 913 920 { 914 { { "", 0 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },915 { { "", 1 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },916 { { "", 256+3, }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) },921 { { "", 0 }, SSAInfo(0, 0, 0, 0, 0, true) }, 922 { { "", 1 }, SSAInfo(0, 0, 0, 0, 0, true) }, 923 { { "", 256+3, }, SSAInfo(0, 0, 0, 0, 0, true) }, 917 924 { { "va", 0 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 918 925 { { "va", 1 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, … … 920 927 { { "va", 3 }, SSAInfo(0, 1, 1, 1, 1, false) }, 921 928 { { "va", 4 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 922 { { "va", 5 }, SSAInfo(0, 1, 1, 1, 1, false) } ,929 { { "va", 5 }, SSAInfo(0, 1, 1, 1, 1, false) } 923 930 }, false, false, false }, 924 931 { 68, 92, 925 932 { { 7, false }, { 11, false }, { 15, false } }, 926 933 { 927 { { "", 0 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) }, 928 { { "", 1 }, SSAInfo(0, SIZE_MAX, 0, SIZE_MAX, 0, true) }, 929 }, false, false, false }, 934 { { "", 0 }, SSAInfo(0, 0, 0, 0, 0, true) }, 935 { { "", 1 }, SSAInfo(0, 0, 0, 0, 0, true) }, 936 { { "", 256+4 }, SSAInfo(0, 0, 0, 0, 0, true) }, 937 { { "va", 0 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 938 { { "va", 1 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 939 { { "va", 2 }, SSAInfo(1, 2, 2, 2, 1, false) }, 940 { { "va", 3 }, SSAInfo(1, 2, 2, 2, 1, false) }, 941 { { "va", 4 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 942 { { "va", 6 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) } 943 }, false, false, true }, 930 944 // 47: 931 { 96, 1 08,945 { 96, 112, 932 946 { }, 933 { }, false, false, false }, 934 { 108, 112, 935 { }, 936 { }, false, false, false }, 937 { 112, 116, 938 { }, 939 { }, false, false, false }, 940 { 116, 124, 947 { 948 { { "va", 0 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 949 { { "va", 1 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 950 { { "vb", 0 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) }, 951 { { "vb", 5 }, SSAInfo(SIZE_MAX, 1, 1, 1, 1, false) } 952 }, false, false, true }, 953 { 112, 120, 941 954 { }, 942 955 { }, false, false, true }, 956 { 120, 128, 957 { }, 958 { 959 { { "", 256+11 }, SSAInfo(0, 0, 0, 0, 0, true) }, 960 { { "va", 9 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) }, 961 { { "vb", 4 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) } 962 }, false, false, true }, 963 { 128, 136, 964 { }, 965 { 966 { { "", 256+11 }, SSAInfo(0, 0, 0, 0, 0, true) }, 967 { { "va", 10 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) }, 968 { { "vb", 4 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) } 969 }, false, false, true }, 943 970 // 811 944 { 1 28, 140,971 { 144, 160, 945 972 { }, 946 { }, false, false, false }, 947 { 140, 148, 948 { }, 949 { }, false, false, false }, 950 { 148, 152, 951 { }, 952 { }, false, false, false }, 953 { 152, 160, 973 { 974 { { "va", 0 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 975 { { "va", 1 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 976 { { "va", 3 }, SSAInfo(SIZE_MAX, 3, 3, 3, 1, false) }, 977 { { "vb", 1 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) } 978 }, false, false, true }, 979 { 160, 172, 954 980 { }, 955 981 { }, false, false, true }, 956 // 1215 957 { 160, 172, 982 { 172, 180, 958 983 { }, 959 { }, false, false, false }, 960 { 172, 176, 961 { }, 962 { }, false, false, false }, 963 { 176, 180, 964 { }, 965 { }, false, false, false }, 984 { }, false, false, true }, 966 985 { 180, 188, 967 986 { }, 987 { 988 { { "", 256+19 }, SSAInfo(0, 0, 0, 0, 0, true) }, 989 { { "va", 8 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) }, 990 { { "vb", 5 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) } 991 }, false, false, true }, 992 // 1215 993 { 192, 208, 994 { }, 995 { 996 { { "va", 0 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 997 { { "va", 1 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 998 { { "vb", 1 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) }, 999 { { "vb", 2 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) }, 1000 { { "vb", 3 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) } 1001 }, false, false, true }, 1002 { 208, 216, 1003 { }, 1004 { 1005 { { "", 256+11 }, SSAInfo(0, 0, 0, 0, 0, true) }, 1006 { { "va", 7 }, SSAInfo(SIZE_MAX, 0, 0, 0, 1, false) }, 1007 { { "vb", 5 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) } 1008 }, false, false, true }, 1009 { 216, 224, 1010 { }, 1011 { 1012 { { "", 256+13 }, SSAInfo(0, 0, 0, 0, 0, true) }, 1013 { { "va", 6 }, SSAInfo(SIZE_MAX, 1, 1, 1, 1, false) }, 1014 { { "vb", 5 }, SSAInfo(0, SIZE_MAX, 1, SIZE_MAX, 0, true) } 1015 }, false, false, true }, 1016 { 224, 232, 1017 { }, 968 1018 { }, false, false, true } 969 1019 }, … … 971 1021 true, "" 972 1022 } 973 #endif974 1023 }; 975 1024
Note: See TracChangeset
for help on using the changeset viewer.