Compare commits
1 Commits
master
...
masstestin
| Author | SHA1 | Date | |
|---|---|---|---|
|
67c38d4fe7 |
410
csim.c
410
csim.c
@ -3,36 +3,25 @@
|
||||
@file csim.c
|
||||
@author Adam Goldsmith
|
||||
@author Jacob Komissar
|
||||
@date 2016-04-25, 2016-04-26, 2016-04-27, 2016-04-28
|
||||
@date 2016-04-25, 2016-04-26, 2016-04-27
|
||||
|
||||
Cachelab: csim.c
|
||||
Simulates a cache with arbitrary sets, associativity, and block size.
|
||||
Reads from a valgrind trace, and outputs the number of hits, misses, and evictions.
|
||||
With the verbose option (-v), outputs details for each operation.
|
||||
@TODO ADD CORRECT NAME COMMENT AT TOP OF FILE
|
||||
|
||||
Exit statuses:
|
||||
Exit statuses:
|
||||
0 - success
|
||||
1 - usage error
|
||||
-1 - file error
|
||||
2 - memory error
|
||||
*/
|
||||
-1 - file error
|
||||
|
||||
/**** Headers ****/
|
||||
*/
|
||||
/* Headers */
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
#include "cachelab.h"
|
||||
|
||||
|
||||
/******** Typedefs and structs ********/
|
||||
/* Typedefs and structs */
|
||||
typedef unsigned char uint8_t;
|
||||
|
||||
typedef struct {
|
||||
int hits;
|
||||
int misses;
|
||||
int evictions;
|
||||
} results;
|
||||
|
||||
/* Linked Line and related prototypes */
|
||||
typedef struct linked_line_s linked_line;
|
||||
struct linked_line_s {
|
||||
@ -43,54 +32,33 @@ struct linked_line_s {
|
||||
};
|
||||
|
||||
|
||||
/******** Macros ********/
|
||||
/* Macros */
|
||||
#define mprintf(...) if (VERBOSE) printf(__VA_ARGS__)
|
||||
|
||||
|
||||
/******** Global variables ********/
|
||||
static uint8_t VERBOSE = 0; /**< If nonzero, mprintf will not print. Set in main() if -v flag is given. */
|
||||
|
||||
/******** General Prototypes ********/
|
||||
|
||||
/* Option-parsing functions */
|
||||
/* General Prototypes */
|
||||
void print_usage(void);
|
||||
void bad_usage_error(void);
|
||||
long parse_int_arg(char *arg, char opt);
|
||||
long bits_to_size(int bits);
|
||||
|
||||
/* Sub-main functions */
|
||||
void increment_result_counters(char result, results* score);
|
||||
|
||||
/* Cache creation/deletion functions */
|
||||
linked_line** make_cache(long num_sets, long num_lines);
|
||||
linked_line** make_cache(long set_indices, long num_lines);
|
||||
linked_line* make_set(linked_line* newer, long num_lines);
|
||||
void free_cache(linked_line** cache, long num_sets);
|
||||
void free_set(linked_line* line);
|
||||
/* Cache-viewing functions */
|
||||
void print_cache(linked_line** cache, long num_sets);
|
||||
void print_set(linked_line* line);
|
||||
|
||||
/* Cache access functions */
|
||||
char cache_access(linked_line** cache, long address, int set_bits, int block_offset_bits, long num_lines);
|
||||
linked_line* find_line(linked_line* set_head, long tag);
|
||||
linked_line* update_set(linked_line* old_head, linked_line* new_head);
|
||||
//linked_line* move_to_head(linked_line* new_head, linked_line* old_head);
|
||||
/* Global variables */
|
||||
uint8_t VERBOSE = 0; /**< If nonzero, mprintf will not print. Set in main() if -v flag is given. */
|
||||
|
||||
|
||||
/** MAIN **/
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
results score;
|
||||
int hits = 0, misses = 0, evictions = 0;
|
||||
char buffer[20];
|
||||
int set_index_bits = 0, block_offset_bits = 0; // Not-useful input variables.
|
||||
long num_sets = 0, num_lines = 0, block_size = 0; //Useful variables
|
||||
int set_index_bits = 0, block_bits = 0; // Not-useful input variables.
|
||||
long set_indices = 0, num_lines = 0, block_size = 0; //Useful variables
|
||||
char *filename = NULL;
|
||||
int opt = 0;
|
||||
|
||||
score.hits = 0;
|
||||
score.misses = 0;
|
||||
score.evictions = 0;
|
||||
|
||||
while ((opt=getopt(argc, argv, "hvs:E:b:t:")) != -1) {
|
||||
switch (opt) {
|
||||
/* TODO: maybe add checking for optarg swallowing actual arguments. */
|
||||
@ -98,15 +66,15 @@ int main(int argc, char* argv[])
|
||||
VERBOSE = 1;
|
||||
break;
|
||||
case 's': // 2^s = number of sets
|
||||
set_index_bits = (int)parse_int_arg(optarg, 's');
|
||||
num_sets = bits_to_size(set_index_bits);
|
||||
set_index_bits = (uint8_t)parse_int_arg(optarg, 's');
|
||||
set_indices = bits_to_size(set_index_bits);
|
||||
break;
|
||||
case 'E': // associativity - lines per set
|
||||
num_lines = parse_int_arg(optarg, 'E');
|
||||
break;
|
||||
case 'b': // 2^b = block size
|
||||
block_offset_bits = (int)parse_int_arg(optarg, 'b');
|
||||
block_size = bits_to_size(block_offset_bits);
|
||||
block_bits = (uint8_t)parse_int_arg(optarg, 'b');
|
||||
block_size = bits_to_size(block_bits);
|
||||
break;
|
||||
case 't':
|
||||
filename = optarg;
|
||||
@ -119,52 +87,40 @@ int main(int argc, char* argv[])
|
||||
}
|
||||
}
|
||||
/* If any required arguments were not provided. (argflags != 0b1111) */
|
||||
if (!num_sets || !num_lines || !block_size || !filename) {
|
||||
if (!set_indices || !num_lines || !block_size || !filename) {
|
||||
bad_usage_error();
|
||||
}
|
||||
/* End of argument parsing. */
|
||||
//probably broken: printf("Arguments: s=%hhu, E=%u, b=%hhu, t=%s, v=%hhu, 2^s=%d, 2^b=%u\n", set_index_bits, num_lines, block_bits, filename, VERBOSE, set_indices, block_size);
|
||||
|
||||
linked_line** cache = make_cache(num_sets, num_lines);
|
||||
linked_line** cache = make_cache(set_indices, num_lines);
|
||||
|
||||
print_cache(cache, set_indices);
|
||||
|
||||
/* FILE READING */
|
||||
FILE* f = fopen(filename, "r");
|
||||
if(!f) {
|
||||
if(!f)
|
||||
{
|
||||
printf("Invalid file name: %s", filename);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
//char buffer[20];
|
||||
while (fgets(buffer, 20, f)) {
|
||||
if (buffer[0] == 'I') {
|
||||
if (buffer[0] == 'I')
|
||||
continue;
|
||||
}
|
||||
|
||||
char* end;
|
||||
char op = buffer[1];
|
||||
long address = strtol(buffer+3, &end, 16);
|
||||
long size = strtol(end+1, NULL, 16);
|
||||
|
||||
if (*end != ',' || !(op == 'S' || op == 'L' || op == 'M')) {
|
||||
printf("Invalid input file, last line:\n%s\n", buffer);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* if(VERBOSE) */
|
||||
/* print_cache(cache, num_sets); */
|
||||
|
||||
mprintf(" %c %lx,%lx", op, address, size);
|
||||
|
||||
char r = cache_access(cache, address, set_index_bits, block_offset_bits, num_lines);
|
||||
increment_result_counters(r, &score);
|
||||
if (op == 'M') { //Access again if modifying
|
||||
r = cache_access(cache, address, set_index_bits, block_offset_bits, num_lines);
|
||||
increment_result_counters(r, &score);
|
||||
printf("%c %ld\n", op, address);
|
||||
}
|
||||
|
||||
mprintf("\n");
|
||||
}
|
||||
|
||||
printSummary(score.hits, score.misses, score.evictions);
|
||||
printSummary(hits, misses, evictions);
|
||||
|
||||
fclose(f);
|
||||
free_cache(cache, set_index_bits);
|
||||
@ -174,7 +130,72 @@ int main(int argc, char* argv[])
|
||||
|
||||
|
||||
|
||||
/************************** OPTION-PARSING FUNCTIONS **************************/
|
||||
|
||||
linked_line** make_cache(long set_indices, long num_lines)
|
||||
{
|
||||
linked_line** cache = (linked_line**)calloc(set_indices, sizeof(linked_line*));
|
||||
long ii;
|
||||
for (ii = 0; ii < set_indices; ii++) {
|
||||
cache[ii] = make_set(NULL, num_lines);
|
||||
}
|
||||
return cache;
|
||||
}
|
||||
|
||||
/**
|
||||
Creates a set by creating and linking a given number of lines.
|
||||
@param newer A pointer to the previously-created element of the set.
|
||||
@param num_lines The number of lines remaining to be added.
|
||||
@return A pointer to the created line.
|
||||
*/
|
||||
linked_line* make_set(linked_line* newer, long num_lines) {
|
||||
linked_line* current = (linked_line*)calloc(1, sizeof(linked_line));
|
||||
current->newer = newer;
|
||||
num_lines--;
|
||||
if (num_lines) { // If not on the last line
|
||||
current->older = make_set(current, num_lines);
|
||||
}
|
||||
else {
|
||||
current->older = NULL;
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
void free_cache(linked_line** cache, long num_sets)
|
||||
{
|
||||
int ii;
|
||||
for (ii = 0; ii < num_sets; ii++) {
|
||||
free_set(cache[ii]);
|
||||
}
|
||||
free(cache);
|
||||
}
|
||||
|
||||
/**
|
||||
Frees a set by recursing through it, then freeing each element from oldest to newest.
|
||||
@param line A pointer to the next line in the set.
|
||||
@param num_lines The number
|
||||
*/
|
||||
void free_set(linked_line* line) {
|
||||
if (line != NULL) {
|
||||
free_set(line->older);
|
||||
free(line);
|
||||
}
|
||||
}
|
||||
|
||||
void print_cache(linked_line** cache, long num_sets)
|
||||
{
|
||||
int ii;
|
||||
for (ii = 0; ii < num_sets; ii++) {
|
||||
print_set(cache[ii]);
|
||||
}
|
||||
}
|
||||
|
||||
void print_set(linked_line* line)
|
||||
{
|
||||
if (line != NULL) {
|
||||
print_set(line->older);
|
||||
printf("%p %x.%lx %p:%p\n", (void *) line, line->validity, line->tag, (void *) line->newer, (void *) line->older);
|
||||
}
|
||||
}
|
||||
|
||||
void print_usage(void)
|
||||
{
|
||||
@ -198,11 +219,10 @@ void bad_usage_error(void)
|
||||
}
|
||||
|
||||
/**
|
||||
Parses a string into a an positive integer; error if not possible.
|
||||
Parses a string into a size_t.
|
||||
@param arg The string to parse.
|
||||
@param opt The option being parsed. If 'E', the output can not be 0.
|
||||
Otherwise, used only for helpful error messages.
|
||||
@return The parsed long integer if the argument was valid .
|
||||
@return The parsed long integer if the argument was an integer.
|
||||
@note Exits if argument is invalid.
|
||||
*/
|
||||
long parse_int_arg(char* arg, char opt)
|
||||
@ -210,254 +230,30 @@ long parse_int_arg(char* arg, char opt)
|
||||
char* end;
|
||||
long i = strtol(arg, &end, 0);
|
||||
|
||||
if (*end != '\0') { // associativity can not be zero
|
||||
if (*end != '\0' || (!i && opt=='E')) { // associativity can not be zero
|
||||
printf("Invalid argument \"%s\" for option -%c\n", arg, opt);
|
||||
bad_usage_error();
|
||||
}
|
||||
else if (i < 0) {
|
||||
printf("Argument %s for option -%c too small (must be greater than 0)", arg, opt);
|
||||
printf("Argument %ld for option %c too small (must be greater than 0)", i, opt);
|
||||
exit(1);
|
||||
}
|
||||
else if (opt == 'E') {
|
||||
long long_max = (~0UL)>>1;
|
||||
if (i==0) {
|
||||
printf("Argument for option -E can not be 0\n");
|
||||
exit(1);
|
||||
}
|
||||
else if (i == long_max) {
|
||||
printf("Argument %s for option -E too large (must be less than %ld)\n", arg, long_max);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
/**
|
||||
Calculates a size using a given number of bits.
|
||||
@param bits The power of 2 to use.
|
||||
@return 2^bits if it does not overflow.
|
||||
@note Exits if number of bits is larger than a signed int.
|
||||
@note Exits if number of bits is larger than a size_t.
|
||||
*/
|
||||
long bits_to_size(int bits)
|
||||
{
|
||||
int max_shift = 8*sizeof(int)-1;
|
||||
int max_shift = 8*sizeof(int);
|
||||
if (bits > max_shift-1) {
|
||||
printf("Argument %d too large (-s and -b must be less than %d)", bits, max_shift);
|
||||
printf("Argument %hhd too large (-s and -b must be less than %hhd)", bits, max_shift);
|
||||
exit(1);
|
||||
}
|
||||
return (long)1 << bits;
|
||||
}
|
||||
|
||||
|
||||
/***************************** SUB-MAIN FUNCTIONS *****************************/
|
||||
|
||||
/**
|
||||
Increments the cgiven ache operation counters based on the given result code.
|
||||
@param result The cache operation result code to parse (H, M, or E).
|
||||
@param score The score struct to increment.
|
||||
@TODO Fix this into a total of 3 conditionals.
|
||||
*/
|
||||
void increment_result_counters(char result, results* score)
|
||||
{
|
||||
if (result == 'H') {
|
||||
score->hits++;
|
||||
mprintf(" hit");
|
||||
}
|
||||
else if (result == 'M') {
|
||||
score->misses++;
|
||||
mprintf(" miss");
|
||||
}
|
||||
else if (result == 'E') {
|
||||
score->misses++;
|
||||
score->evictions++;
|
||||
mprintf(" miss eviction");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/********************* CACHE CREATION/DELETION FUNCTIONS *********************/
|
||||
|
||||
/**
|
||||
@param num_sets The number of sets in the cache.
|
||||
@param num_lines The number of lines in each set.
|
||||
@return A pointer to the allocated cache's set list.
|
||||
@TODO Handle cases where not enough space can be allocated.
|
||||
*/
|
||||
linked_line** make_cache(long num_sets, long num_lines)
|
||||
{
|
||||
linked_line** cache = (linked_line**)calloc(num_sets, sizeof(linked_line*));
|
||||
if (! cache) {
|
||||
printf("Error: calloc failed\n");
|
||||
exit(2);
|
||||
}
|
||||
long ii;
|
||||
for (ii = 0; ii < num_sets; ii++) {
|
||||
cache[ii] = make_set(NULL, num_lines);
|
||||
}
|
||||
return cache;
|
||||
}
|
||||
|
||||
/**
|
||||
Creates a set by creating and linking a given number of lines.
|
||||
@param newer A pointer to the previously-created element of the set.
|
||||
@param num_lines The number of lines remaining to be added.
|
||||
@return A pointer to the created line.
|
||||
@bug Large values for num_lines result in a segfault in the call to calloc.
|
||||
@TODO Free already-allocated space in event of allocation failure.
|
||||
*/
|
||||
linked_line* make_set(linked_line* newer, long num_lines) {
|
||||
linked_line* current = (linked_line*)calloc(1, sizeof(linked_line));
|
||||
if (! current) {
|
||||
printf("Error: calloc failed\n");
|
||||
exit(2);
|
||||
}
|
||||
current->newer = newer;
|
||||
num_lines--;
|
||||
if (num_lines) { // If not on the last line
|
||||
current->older = make_set(current, num_lines);
|
||||
}
|
||||
else {
|
||||
current->older = NULL;
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
/**
|
||||
@param cache A pointer to the cache to free.
|
||||
@param num_sets The number of sets in the cache.
|
||||
*/
|
||||
void free_cache(linked_line** cache, long num_sets)
|
||||
{
|
||||
int ii;
|
||||
for (ii = 0; ii < num_sets; ii++) {
|
||||
free_set(cache[ii]);
|
||||
}
|
||||
free(cache);
|
||||
}
|
||||
|
||||
/**
|
||||
Frees a set by recursing through it, then freeing each element from oldest to newest.
|
||||
@param line A pointer to the next line in the set.
|
||||
@param num_lines The number
|
||||
*/
|
||||
void free_set(linked_line* line) {
|
||||
if (line != NULL) {
|
||||
free_set(line->older);
|
||||
free(line);
|
||||
}
|
||||
}
|
||||
|
||||
/************************** CACHE VIEWING FUNCTIONS **************************/
|
||||
|
||||
/**
|
||||
@cache The cache to print.
|
||||
@cache num_sets The number of sets in the cache.
|
||||
*/
|
||||
void print_cache(linked_line** cache, long num_sets)
|
||||
{
|
||||
int ii;
|
||||
for (ii = 0; ii < num_sets; ii++) {
|
||||
print_set(cache[ii]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Prints a cache line and all lines modified less recently than it in its set.<br />
|
||||
The format is: <br />
|
||||
address validity.tag address of newer:address of older
|
||||
@param line The set/line to print, or NULL. If null, does nothing.
|
||||
*/
|
||||
void print_set(linked_line* line)
|
||||
{
|
||||
if (line != NULL) {
|
||||
print_set(line->older);
|
||||
printf("%p %x.%lx\t\t%p:%p\n", (void *) line, line->validity,
|
||||
line->tag, (void *) line->newer, (void *) line->older);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*************************** CACHE ACCESS FUNCTIONS ***************************/
|
||||
|
||||
/**
|
||||
Simulates a cache access operation.
|
||||
@param cache The cache to access.
|
||||
@param address The address to access in the cache.
|
||||
@param set_bits The number of set bits in the address.
|
||||
@param block_offset_bits The number of block offset bits in the address.
|
||||
@param num_lines The number of lines per set.
|
||||
@return 'H' if a hit, 'M' if a miss, 'E' if a miss and eviction
|
||||
|
||||
@TODO Pass set and tag into cache_access instead of an address and sizes.
|
||||
@TODO Make the tag and set retrieval a function?
|
||||
@TODO Make the re-linking of the set into its own function.
|
||||
*/
|
||||
char cache_access(linked_line** cache, long address,
|
||||
int set_bits, int block_offset_bits, long num_lines)
|
||||
{
|
||||
char operation;
|
||||
long tag = address >> set_bits >> block_offset_bits;
|
||||
long set = (address >> block_offset_bits) & ((1 << set_bits) - 1);
|
||||
linked_line* set_head = cache[set];
|
||||
linked_line* line = find_line(set_head, tag);
|
||||
|
||||
if (!line->validity) {
|
||||
operation = 'M';
|
||||
}
|
||||
else if (line->tag == tag) {
|
||||
operation = 'H';
|
||||
}
|
||||
else {
|
||||
operation = 'E';
|
||||
}
|
||||
|
||||
line->tag = tag;
|
||||
line->validity = 1;
|
||||
|
||||
cache[set] = update_set(set_head, line);
|
||||
|
||||
return operation;
|
||||
}
|
||||
|
||||
/**
|
||||
Finds a line in the given set that holds the given tag, or the least-recently
|
||||
used line if the tag is not in the set, or the next invalid line if not all
|
||||
of the lines have been used.
|
||||
@param line Initially, the most-recently-used line in the set. In the
|
||||
recursion, iterates through the lines in the set.
|
||||
@returns The first line with a matching tag, the first invalid line,
|
||||
or the first line without an older (i.e. the end of the set).
|
||||
*/
|
||||
linked_line* find_line(linked_line* line, long tag)
|
||||
{
|
||||
if (line->tag == tag || !line->validity || !line->older) {
|
||||
return line;
|
||||
}
|
||||
else {
|
||||
return find_line(line->older, tag);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Updates the use order of a set by moving the line being accessed in front of
|
||||
the previously-accessed line and linking the neighbors of the new head.
|
||||
@param old_head The previous most-recently modified line of the set.
|
||||
@param new_head The line of the set being accessed.
|
||||
@return new_head
|
||||
*/
|
||||
linked_line* update_set(linked_line* old_head, linked_line* new_head) {
|
||||
if(!(new_head == old_head)) {
|
||||
new_head->newer->older = new_head->older;
|
||||
if(new_head->older) {
|
||||
new_head->older->newer = new_head->newer;
|
||||
}
|
||||
new_head->newer = NULL;
|
||||
new_head->older = old_head;
|
||||
old_head->newer = new_head;
|
||||
}
|
||||
return new_head;
|
||||
return (size_t)1 << bits;
|
||||
}
|
||||
|
||||
|
||||
|
||||
38
test.sh
Executable file
38
test.sh
Executable file
@ -0,0 +1,38 @@
|
||||
#!/bin/bash
|
||||
|
||||
# yi, yi2, dave, long, trans
|
||||
|
||||
if [ $# -lt 3 ]; then
|
||||
echo "Not enough arguments."
|
||||
exit
|
||||
fi
|
||||
|
||||
arg1=$1; shift 1
|
||||
arg2=$1; shift 1
|
||||
arg3=$1; shift 1
|
||||
|
||||
files=()
|
||||
if [ "$1" == '*' ]; then
|
||||
files+=( 'dave' 'long' 'trans' 'yi' 'yi2' )
|
||||
elif [ $# ]; then
|
||||
for arg in $@; do
|
||||
files+=("$arg")
|
||||
done
|
||||
else
|
||||
files+=( 'dave' 'long' 'trans' 'yi' 'yi2' )
|
||||
fi
|
||||
|
||||
echo 'Only errors are shown. Order is "s E b file"'
|
||||
for i in $(seq $arg1); do
|
||||
for j in $(seq $arg2); do
|
||||
for k in $(seq $arg3); do
|
||||
for f in ${files[@]}; do
|
||||
args="-s $i -E $j -b $k -t traces/$f.trace"
|
||||
dif=$(diff <(./csim $args) <(./csim-ref $args))
|
||||
if [dif]; then
|
||||
echo "$i $j $k $f"
|
||||
fi
|
||||
done
|
||||
done
|
||||
done
|
||||
done
|
||||
48
trans.c
48
trans.c
@ -12,29 +12,6 @@
|
||||
|
||||
int is_transpose(int M, int N, int A[N][M], int B[M][N]);
|
||||
|
||||
void print_array(int M, int N, int A[N][M], int x, int y)
|
||||
{
|
||||
int i,j;
|
||||
for (i = 0; i < N; i++) {
|
||||
for (j = 0; j < M; j++) {
|
||||
if(i == y && j == x)
|
||||
printf("\x1B[31m # \x1B[0m");
|
||||
else
|
||||
printf(" # ");
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
void diff_array(int M, int N, int A[N][M], int B[M][N], int x, int y)
|
||||
{
|
||||
printf("%d, %d\n", x, y);
|
||||
print_array(M, N, A, x, y);
|
||||
printf("\n");
|
||||
print_array(N, M, B, y, x);
|
||||
getchar();
|
||||
}
|
||||
|
||||
/*
|
||||
* transpose_submit - This is the solution transpose function that you
|
||||
* will be graded on for Part B of the assignment. Do not change
|
||||
@ -45,31 +22,6 @@ void diff_array(int M, int N, int A[N][M], int B[M][N], int x, int y)
|
||||
char transpose_submit_desc[] = "Transpose submission";
|
||||
void transpose_submit(int M, int N, int A[N][M], int B[M][N])
|
||||
{
|
||||
int blocksize = 8; //2^5/4
|
||||
int i, j, k, diag, diagX, diagY;
|
||||
for(i=0; i<M; i+=blocksize)
|
||||
{
|
||||
for(j=0; j<N; j++)
|
||||
{
|
||||
diag = 0;
|
||||
for(k=0; k<blocksize && (i+k < M); k++)
|
||||
{
|
||||
if (j*N + i + k != (i + k)*M + j)
|
||||
{
|
||||
B[i+k][j] = A[j][i+k];
|
||||
//diff_array(M, N, A, B, j, i+k);
|
||||
}
|
||||
else
|
||||
{
|
||||
diag = A[j][i+k];
|
||||
diagX = i+k;
|
||||
diagY = j;
|
||||
}
|
||||
}
|
||||
if(diag)
|
||||
B[diagX][diagY] = diag;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user