mirror of
https://github.com/amd/blis.git
synced 2026-05-11 09:39:59 +00:00
Merge branch 'master' into compose
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
libraries.
|
||||
|
||||
Copyright (C) 2014, The University of Texas at Austin
|
||||
Copyright (C) 2016 Hewlett Packard Enterprise Development LP
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
@@ -58,6 +59,10 @@
|
||||
\
|
||||
( (mem_p)->pool )
|
||||
|
||||
#define bli_mem_membrk( mem_p ) \
|
||||
\
|
||||
( (mem_p)->membrk )
|
||||
|
||||
#define bli_mem_size( mem_p ) \
|
||||
\
|
||||
( (mem_p)->size )
|
||||
@@ -90,12 +95,17 @@
|
||||
|
||||
#define bli_mem_set_buf_type( buf_type0, mem_p ) \
|
||||
{ \
|
||||
mem_p->buf_type = buf_type0; \
|
||||
(mem_p)->buf_type = buf_type0; \
|
||||
}
|
||||
|
||||
#define bli_mem_set_pool( pool0, mem_p ) \
|
||||
{ \
|
||||
mem_p->pool = pool0; \
|
||||
(mem_p)->pool = pool0; \
|
||||
}
|
||||
|
||||
#define bli_mem_set_membrk( membrk0, mem_p ) \
|
||||
{ \
|
||||
(mem_p)->membrk = membrk0; \
|
||||
}
|
||||
|
||||
#define bli_mem_set_size( size0, mem_p ) \
|
||||
@@ -109,6 +119,7 @@
|
||||
bli_mem_set_buf_sys( NULL, mem_p ); \
|
||||
bli_mem_set_pool( NULL, mem_p ); \
|
||||
bli_mem_set_size( 0, mem_p ); \
|
||||
bli_mem_set_membrk( NULL, mem_p ); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
libraries.
|
||||
|
||||
Copyright (C) 2014, The University of Texas at Austin
|
||||
Copyright (C) 2016 Hewlett Packard Enterprise Development LP
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
@@ -957,14 +958,14 @@ bli_obj_width_stored( obj )
|
||||
}
|
||||
|
||||
|
||||
// Release object's pack (and cast) memory entries back to memory manager
|
||||
// Release object's pack mem_t entries back to memory manager
|
||||
|
||||
#define bli_obj_release_pack( obj_p ) \
|
||||
{ \
|
||||
mem_t* pack_mem_ = bli_obj_pack_mem( *(obj_p) ); \
|
||||
\
|
||||
if ( bli_mem_is_alloc( pack_mem_ ) ) \
|
||||
bli_mem_release( pack_mem_ ); \
|
||||
bli_membrk_release( pack_mem_ ); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
libraries.
|
||||
|
||||
Copyright (C) 2014, The University of Texas at Austin
|
||||
Copyright (C) 2016 Hewlett Packard Enterprise Development LP
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
@@ -173,7 +174,6 @@ typedef scomplex f77_scomplex;
|
||||
typedef dcomplex f77_dcomplex;
|
||||
|
||||
|
||||
|
||||
//
|
||||
// -- BLIS info bit field offsets ----------------------------------------------
|
||||
//
|
||||
@@ -514,6 +514,10 @@ typedef enum
|
||||
// -- BLIS misc. structure types -----------------------------------------------
|
||||
//
|
||||
|
||||
// -- Mutex type --
|
||||
|
||||
typedef struct mtx_s mtx_t;
|
||||
|
||||
// -- Pool block type --
|
||||
|
||||
typedef struct
|
||||
@@ -536,6 +540,19 @@ typedef struct
|
||||
siz_t align_size;
|
||||
} pool_t;
|
||||
|
||||
// -- Memory broker object type --
|
||||
|
||||
typedef struct membrk_s membrk_t;
|
||||
/*
|
||||
{
|
||||
pool_t pools[3];
|
||||
mtx_t mutex;
|
||||
|
||||
malloc_ft malloc_fp;
|
||||
free_ft free_fp;
|
||||
} membrk_t;
|
||||
*/
|
||||
|
||||
// -- Memory object type --
|
||||
|
||||
typedef struct mem_s
|
||||
@@ -543,6 +560,7 @@ typedef struct mem_s
|
||||
pblk_t pblk;
|
||||
packbuf_t buf_type;
|
||||
pool_t* pool;
|
||||
membrk_t* membrk;
|
||||
siz_t size;
|
||||
} mem_t;
|
||||
|
||||
@@ -919,6 +937,7 @@ typedef struct cntx_s
|
||||
pack_t schema_b;
|
||||
pack_t schema_c;
|
||||
|
||||
membrk_t* membrk;
|
||||
} cntx_t;
|
||||
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
libraries.
|
||||
|
||||
Copyright (C) 2014, The University of Texas at Austin
|
||||
Copyright (C) 2016 Hewlett Packard Enterprise Development LP
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
@@ -103,6 +104,7 @@ extern "C" {
|
||||
#include "bli_cntx.h"
|
||||
#include "bli_gks.h"
|
||||
#include "bli_ind.h"
|
||||
#include "bli_membrk.h"
|
||||
#include "bli_pool.h"
|
||||
#include "bli_mem.h"
|
||||
#include "bli_part.h"
|
||||
|
||||
Reference in New Issue
Block a user