OpenCores
URL https://opencores.org/ocsvn/connect-6/connect-6/trunk

Subversion Repositories connect-6

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /connect-6
    from Rev 17 to Rev 18
    ↔ Reverse comparison
  •

Rev 17 → Rev 18

/trunk/XILINX/BUILD_SCC_SRCH/SP6/SP6.do_synth
31,9 → 31,9
cd run/implementation
ngdbuild -uc ../../SP6.ucf -sd ../../../../coregen/ip_rtl/ -dd _ngo -nt timestamp -p xc6slx45t-fgg484-3 ../synthesis/DE2.edf DE2.ngd
if [[ $? != 0 ]]; then exit 1; fi
map -u -timing -p xc6slx45t-fgg484-3 -ol high -pr b -detail -o DE2_map.ncd DE2.ngd DE2.pcf
map -u -timing -p xc6slx45t-fgg484-3 -ol high -pr off -detail -logic_opt on -xe n -xt 0 -register_duplication on -r 4 -global_opt off -ir all -lc off -power off -mt 2 -o DE2_map.ncd DE2.ngd DE2.pcf
if [[ $? != 0 ]]; then exit 1; fi
par -ol high -w -nopad DE2_map.ncd DE2.ncd DE2.pcf
par -ol high -xe n -mt 4 -w -nopad DE2_map.ncd DE2.ncd DE2.pcf
if [[ $? != 0 ]]; then exit 1; fi
trce -v 20 -u 64 -o DE2.twr DE2.ncd DE2.pcf
if [[ $? != 0 ]]; then exit 1; fi
/trunk/XILINX/BUILD_SCC_SRCH/synth_src/search_bfs.cpp
32,8 → 32,12
}
int mod2(int x){
#pragma bitsize x 5
int ans[16]={0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1};
return ans[x];
int y;
#pragma bitsize y 5
////int ans[32]={0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1};
//int ans[32]={1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
//return ans[x+16];
y=x & 1;
}
int mod5(int x){
#pragma bitsize x 5
58,14 → 62,14
int branch=player->branch;
 
board_copy(b, &b_next[0][0]);
ai_threats(b_next,0,0,moves_next/*,index*/);
utility[0][0]=moves_next[0][0].utility;
turn[0]=b->turn;
for(i=0;i<branch;i++){
moves->data[i].x=moves_next[0][0].data[i].x;
moves->data[i].y=moves_next[0][0].data[i].y;
//moves->data[i].weight=moves_next[1][i].utility;
}
//ai_threats(b_next,0,0,moves_next/*,index*/);
//utility[0][0]=moves_next[0][0].utility;
//turn[0]=b->turn;
//for(i=0;i<branch;i++){
//moves->data[i].x=moves_next[0][0].data[i].x;
//moves->data[i].y=moves_next[0][0].data[i].y;
////moves->data[i].weight=moves_next[1][i].utility;
//}
 
///* Search only the top moves beyond the minimum */
////aimoves_sort(moves);
79,13 → 83,13
 
/* No moves left -- its a draw */
if (moves_next[0][0].len < 1) //"(%s)", bcoords_to_string(aim->x, aim->y));
//if (moves_next[0][0].len < 1) //"(%s)", bcoords_to_string(aim->x, aim->y));
 
return AIW_DRAW;
// return AIW_DRAW;
//board_copy(b, &b_next[0][0]);
 
/* Search each move available in depth first order */
for(j=0;j<depth;j++){
for(j=-1;j<depth;j++){
int k,branches=1;
for(k=0;k<j+1;k++) branches*=branch;
//int branches=(player->branch)^j;
94,16 → 98,18
//int next_j=(j+1) % 2;
int current_j=mod2(j);
int next_j=mod2(j+1);
if (b_next[current_j][0].moves_left <= 0) turn[j]=other_player(b_next[current_j][0].turn);
else turn[j]=b_next[current_j][0].turn;
if(j!=-1){
if (b_next[current_j][0].moves_left <= 0) turn[j+1]=other_player(b_next[current_j][0].turn);
else turn[j+1]=b_next[current_j][0].turn;
}else turn[0]=b->turn;
for (i = 0; i < branches; i++) {
//if(!(moves_next[j][i>>1].utility==AIW_WIN || moves_next[j][i>>1].utility==-AIW_WIN)){
if(!(utility[j][i>>1]==AIW_WIN || utility[j][i>>1]==-AIW_WIN)){
//AIMove aim = *(moves_next[current_j][i>>1].data + (i % branch));
AIMove aim = *(moves_next[current_j][i>>1].data + mod2(i));
AIMove aim;
//////////////////////////////////////////////////////////if(!(utility[j][i>>1]==AIW_WIN || utility[j][i>>1]==-AIW_WIN)){
if(j!=-1){
//aim = *(moves_next[current_j][i>>1].data + (i % branch));
aim = *(moves_next[current_j][i>>1].data + mod2(i));
//printf ("aim->utility %d \n",utility[j][i>>1]);
board_copy(&b_next[current_j][i>>1], &b_next[next_j][i]);
//if(moves_next[j][i/2].len<branch) printf ("caca");
//printf("%d %d\n",aim.x,aim.y);
125,10 → 131,11
 
//b_next = board_new();
place_piece(&b_next[next_j][i], aim.x, aim.y);
AIWEIGHT next_alpha = alpha, next_beta = beta;
//AIWEIGHT next_alpha = alpha, next_beta = beta;
//AIFunc func;
 
 
}else{
aim.x=-1;aim.y=-1;
/* Player has changed */
//printf("depth %d branches %d turn %d \n\n",j,branches,turn[j]);
if (b_next[next_j][i].moves_left <= 0) {
135,24 → 142,25
b_next[next_j][i].moves_left = place_p;
b_next[next_j][i].turn = other_player(b_next[current_j][i].turn);
searched++;
next_alpha = -beta;
next_beta = -alpha;
//next_alpha = -beta;
//next_beta = -alpha;
}
b_next[next_j][i].moves_left--;
 
}
/* Did we win? */
if (check_win_full(&b_next[1][i], aim.x, aim.y,0,0,0,0)){
if (check_win_full(&b_next[next_j][i], aim.x, aim.y,0,0,0,0)){
aim.weight = AIW_WIN;
moves_next[next_j][i].utility=AIW_WIN;
utility[j+1][i]=AIW_WIN;
 
//}else if(moves_next[j][i>>1].utility==AIW_WIN || moves_next[j][i>>1].utility==-AIW_WIN ){
}else if(utility[j][i>>1]==AIW_WIN || utility[j][i>>1]==-AIW_WIN ){
//moves_next[j+1][i].utility=AIW_WIN;
utility[j+1][i]=AIW_WIN;
/* Otherwise, search deeper */
/////////////////////////////////////////////////////////////////}else if(moves_next[j][i>>1].utility==AIW_WIN || moves_next[j][i>>1].utility==-AIW_WIN ){
/////////////////////////////////////////////////////////////////}else if(utility[j][i>>1]==AIW_WIN || utility[j][i>>1]==-AIW_WIN ){
///////////////////////////////////////////////////////////////// //moves_next[j+1][i].utility=AIW_WIN;
///////////////////////////////////////////////////////////////// utility[j+1][i]=AIW_WIN;
//////////////////////////////////////////////////////////////////* Otherwise, search deeper */
}else {
 
//func = ai(player->ai)->func;
199,17 → 207,26
// return alpha;
//}
//printf("%d %d %d\n",j,i,moves_next[j+1][i].utility);
}else //moves_next[j+1][i].utility=AIW_WIN;
utility[j+1][i]=AIW_WIN;
/////////////////////////////////////////////////////////////}else //moves_next[j+1][i].utility=AIW_WIN;
///////////////////////////////////////////////////////////// utility[j+1][i]=AIW_WIN;
}
if(j==-1){
for(k=0;k<branch;k++){
moves->data[k].x=moves_next[0][0].data[k].x;
moves->data[k].y=moves_next[0][0].data[k].y;
//moves->data[i].weight=moves_next[1][i].utility;
}
if (moves_next[0][0].len < 1)
return AIW_DRAW;
}
}
for(j=depth-2;j>=0;j--){
int k,branches=1;
for(k=0;k<j+1;k++) branches*=branch;
//int branches=(player->branch)^j;
//printf("branches %d player %d\n",branches,b_next[j+1][i].turn);
for (i = 0; i < branches; i=i+2) {
//if (b_next[next_j][i].turn != b->turn)
//printf("branches %d player %d %d %d\n",branches,b_next[j+1][i].turn,j,i);
if (turn[j] != b->turn)
//moves_next[j][i>>1].utility=mini(moves_next[j+1][i].utility,moves_next[j+1][i+1].utility);
utility[j][i>>1]=mini(utility[j+1][i],utility[j+1][i+1]);
217,7 → 234,7
//moves_next[j][i>>1].utility=maxi(moves_next[j+1][i].utility,moves_next[j+1][i+1].utility);
utility[j][i>>1]=maxi(utility[j+1][i],utility[j+1][i+1]);
//printf("%d %d\n",moves_next[j+1][i].utility,moves_next[j+1][i+1].utility);
//printf("%d %d\n",moves_next[j+1][i].utility,moves_next[j+1][i+1].utility);
}
}
/trunk/XILINX/BUILD_SCC_SRCH/synth_src/state.cpp
637,7 → 637,7
int i, c1, c2, xs[] = {1, 1, 0, -1}, ys[] = {0, 1, 1, 1};
PIECE type;
PIECE p;
 
if(x<0 || y<0) return FALSE;
type = piece_at(b, x, y);
if (type != PIECE_BLACK && type != PIECE_WHITE)
return FALSE;
/trunk/XILINX/BUILD_SCC_SRCH/synth_src/main.cpp
28,21 → 28,12
#endif
#include "shared.h"
 
#ifndef EMUL
// The AI has as much time as it wants, but moves after 1 second. Default is to wait 2 seconds
#define AI_WAIT_TIME 0.1
 
// FPGA has 1 second to make its move
#define MOVE_TIME_LIMIT 0.1
#endif
 
#ifdef EMUL
// The AI has as much time as it wants, but moves after 1 second. Default is to wait 2 seconds
#define AI_WAIT_TIME 0.1
 
// FPGA has 1 second to make its move
#define MOVE_TIME_LIMIT 1
#endif
using namespace std;
extern "C" int main(int argc, char **argv);
// commandline option: -port <serialport>
134,12 → 125,6
board[y][x] = FPGA_colour;
print_board(board);
print_board_file(board);
#ifdef EMUL
if(move[0]!=moveportout[0]||move[1]!=moveportout[1]||move[2]!=moveportout[2]||move[3]!=moveportout[3]) {
printf("EMULATION FAIL: BEHAVIOUR Doesn't match \"%c%c%c%c\" X \"%c%c%c%c\"\n",move[0],move[1],move[2],move[3],moveportout[0],moveportout[1],moveportout[2],moveportout[3]);
//exit(1);
}
#endif
wait(AI_WAIT_TIME);
 
 
200,12 → 185,6
}
y = char_to_int(move[0])*10 + char_to_int(move[1]) - 1;
x = char_to_int(move[2])*10 + char_to_int(move[3]) - 1;
#ifdef EMUL
if(move[0]!=moveportout[0]||move[1]!=moveportout[1]||move[2]!=moveportout[2]||move[3]!=moveportout[3]) {
printf("EMULATION FAIL: BEHAVIOUR Doesn't match \"%c%c%c%c\" X \"%c%c%c%c\"\n",move[0],move[1],move[2],move[3],moveportout[0],moveportout[1],moveportout[2],moveportout[3]);
//exit(1);
}
#endif
if (check_move_validity(board,y,x) < 0) break;
board[y][x] = FPGA_colour;
winning_colour = check_for_win(board);
241,12 → 220,6
}
y = char_to_int(move[0])*10 + char_to_int(move[1]) - 1;
x = char_to_int(move[2])*10 + char_to_int(move[3]) - 1;
#ifdef EMUL
if(move[0]!=moveportout[4]||move[1]!=moveportout[5]||move[2]!=moveportout[6]||move[3]!=moveportout[7]) {
printf("EMULATION FAIL: BEHAVIOUR Doesn't match \"%c%c%c%c\" X \"%c%c%c%c\"\n",move[0],move[1],move[2],move[3],moveportout[4],moveportout[5],moveportout[6],moveportout[7]);
//exit(1);
}
#endif
if (check_move_validity(board,y,x) < 0) break;
board[y][x] = FPGA_colour;
winning_colour = check_for_win(board);
/trunk/XILINX/BUILD_SCC_SRCH/Makefile
48,7 → 48,7
 
 
#first the c/c++ source should be compiled
fpga: synth altera_synth test
fpga: synth xilinx_synth test
cp cp ./rtl_package/synth/altera_fpga/run/DE2.sof ../DEMO
 
synth: imp_connect.tag

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.